diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-01-05 19:11:11 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-01-05 19:11:11 +1100 |
| commit | 7a769a3922d81cfc74ab4d90a9cc69485f260976 (patch) | |
| tree | a64d06eb510015c60c9a0aa5829ed82d5d3b8455 | |
| parent | 612de5464f4077e4918eed99f4b31cfbd0781c69 (diff) | |
Add linux-next specific files for 20220105next-20220105
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 349 | ||||
| -rw-r--r-- | Next/Trees | 351 | ||||
| -rw-r--r-- | Next/merge.log | 13953 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 14654 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..e669316aedc8 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,349 @@ +Name SHA1 +---- ---- +origin c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +fixes d06c942efea40e1701ade200477a7449008d9f24 +kbuild-current e851dfae4371d3c751f1e18e8eb5eba993de1467 +arc-current 8f67f65d121cc3bbb4ffaae80e880aeb307d49f4 +arm-current 8536a5ef886005bc443c2da9b842d69fd3d7647f +arm64-fixes 9c5d89bc10551f1aecd768b00fca3339a7b8c8ee +arm-soc-fixes 7ad8b2fcb8509792a1714d937263aeb5bff4f654 +drivers-memory-fixes 8c5ba21c16bd7f8e23b8740dead6eaf164b8caa0 +tee-fixes d58071a8a76d779eedab38033ae4c821c30295a5 +m68k-current 8a3c0a74ae87473589cb881a3854948d40000b7a +powerpc-fixes 8d84fca4375e3c35dadc16b8c7eee6821b2a575c +s390-fixes 4eb1782eaa9fa1c224ad1fa0d13a9f09c3ab2d80 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 6f89ecf10af1396ddc34c303ae1168a11f3f04a3 +bpf d6d86830705f173fca6087a3e67ceaf68db80523 +ipsec 68ac0f3810e76a853b5f7b90601a05c3048b8b54 +netfilter 5471d5226c3b39b3d2f7011c082d5715795bd65c +ipvs 5471d5226c3b39b3d2f7011c082d5715795bd65c +wireless-drivers f7d55d2e439fa4430755d69a5d7ad16d43a5ebe6 +mac80211 6f89ecf10af1396ddc34c303ae1168a11f3f04a3 +rdma-fixes c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +sound-current 08977fe8cfb7d9fe9337470eec4843081cf3a76d +sound-asoc-fixes c9d633f3257e099f1e2b9b687942de18e2f8c207 +regmap-fixes 459e1cd0d5ec360fb7e601701fbc1179e33de517 +regulator-fixes 85223d609c99eaa07cc598632b426cb33753526f +spi-fixes 6210a7a0f2cd3345f809f028eea0105a1777c8a4 +pci-current 87620512681a20ef24ece85ac21ff90c9efed37d +driver-core.current 136057256686de39cc3a07c2e39ef6bc43003ff6 +tty.current a7904a538933c525096ca2ccde1e60d0ee62c08e +usb.current c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes a7904a538933c525096ca2ccde1e60d0ee62c08e +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy f0ae8685b2858fc1dabf5ea743642abb5f242375 +staging.current d58071a8a76d779eedab38033ae4c821c30295a5 +iio-fixes 8f80931a3a4d6a9efd759a7edba9528489453a2d +char-misc.current c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +soundwire-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +thunderbolt-fixes c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +input-current bc7ec91718c49d938849697cfad98fcd9877cc26 +crypto-current 27750a315aba7e6675bb1c3dfd4481c4f6888af1 +vfio-fixes 8704e89349080bd640d1755c46d8cdc359a89748 +kselftest-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +modules-fixes 2a987e65025e2b79c6d453b78cb5985ac6e5eb26 +dmaengine-fixes 822c9f2b833c53fc67e8adf6f63ecc3ea24d502c +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 27a030e8729255b2068f35c1cd609b532b263311 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes d40f0b133b44dc8ae2935d935add304496a19044 +reset-fixes 92c959bae2e54ba1e2540ba5f813f7752bd76be1 +mips-fixes 09d97da660ff77df20984496aa0abcd6b88819f2 +at91-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +omap-fixes 80d680fdccba214e8106dc1aa33de5207ad75394 +kvm-fixes fdba608f15e2427419997b0898750a49a735afcb +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes fc74e0a40e4f9fd0468e34045b0c45bba11dcbb2 +nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes c748b846dab6133a18a11eaa1df04f0abc1896c2 +vfs-fixes 25f54d08f12feb593e62cc2193fedefaf7825301 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 26a8b09437804fabfb1db080d676b96c0de68e7c +samsung-krzk-fixes 4f5d06d381badc6e16f6d54eac7ab0125e9a7168 +pinctrl-samsung-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +devicetree-fixes b398123bff3bcbc1facb0f29bf6e7b9f1bc55931 +scsi-fixes 142c779d05d1fef75134c3cb63f52ccbc96d9e1f +drm-fixes ce9b333c73a5a8707f2f446a837a6ca743ddcffd +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +mmc-fixes ff31ee0a0f471776f67be5e5275c18d17736fc6b +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes 136057256686de39cc3a07c2e39ef6bc43003ff6 +hyperv-fixes 1dc2f2b81a6a9895da59f3915760f6c0c3074492 +soc-fsl-fixes 7e5e744183bbb0ad02412b21b1e61380c998dd18 +risc-v-fixes f6f7fbb89bf8dc9132fde55cfe67483138eea880 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +spdx bc128349588d571b55bfec471a773e29cfcd2d73 +gpio-brgl-fixes 32e246b02f53b2fdaa81ea9f2ca6ff068c017fcb +gpio-intel-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +pinctrl-intel-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +erofs-fixes 57bbeacdbee72a54eb97d56b876cf9c94059fc34 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes d7f55471db2719629f773c2d6b5742a69595bfd3 +cel-fixes 53b1119a6e5028b125f431a0116ba73510d82a72 +irqchip-fixes c3fbab7767c53397d7b849799474f5a27cf306e6 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +efi-fixes 4bc5e64e6cf37007e436970024e5998ee0935651 +zstd-fixes d58071a8a76d779eedab38033ae4c821c30295a5 +drm-misc-fixes 22bf4047d26980807611b7e2030803db375afd87 +kbuild 4dc0759c563a9aa3aa09c316a066d265f3930887 +perf b9f6fbb3b2c29736970ae9fcc0e82b0bd459442b +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping f857acfc457ea63fa5b862d77f055665d863acfe +asm-generic 733e417518a69b71061c3bafc2bf106109565eee +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm e00dd02c0e0fe8b92ad893e8120afcbd255fc25f +arm64 52d3ff9d3658cf405df1e36531da9e0957332c3b +arm-perf 1609c22a8a095d0affed072e345704df5a94f0b0 +arm-soc 49b721df4e3d41c41504c6ff3feb0a7daa1c39ed +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 996b0777eacabd7e5bcc05d32a0c62a301bb3791 +aspeed a7e02e92755c4dcfbbf2ae217beef5e0e68db9eb +at91 9be3df0e718c07dcf5b34c6c1c8f96e774d1b392 +drivers-memory ff086e15d8381b2e81a0d071cbf54c23e725fc32 +imx-mxs b95a3922f285b2e46114792966f83b376c7100ae +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek ccf7b63aac3ebac063840e0347e0cf20c9e19312 +mvebu d835946fc3d886fa6eca32b308ec897aec6d7a45 +omap 61b6b9cfada4262dad54a3153eb1e8ee0e087362 +qcom 7e5fe035d019d6ee4940c7328ca75ce7d87b0b0d +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas 7430027307374f7d8cdec708f61b1bc22d95b913 +reset 89e7a6698fdd6d0cccf5bab11abc51f813944cd8 +rockchip 2a9ed9fa8fe5d088a0e642c8a95ca1d625dcccb9 +samsung-krzk b1cbda0fc3431b464aa78b5f335a5d35428f10c8 +scmi a0708ab076337ff4419b5d7a7bd8c49d0a9c98e8 +stm32 3ff0810ffc4793bfde454a452837484d0815aa14 +sunxi 1d21ba6546a59db008fb84a976bce25d4467cf5d +tee ce352be35ba0957af203567cd0d601a42010e84a +tegra 707b8867420662489ad15d8c13e176ba911da02e +ti e66d73b2aa7672ce62fa221fce359210822abaec +xilinx 2eb48e610ef7a2bf382033c0761b065703d9ae99 +clk 79ace752c9ea1f0d8d4879ac3fb60c466a74c51c +clk-imx 9dd81021084ff22cf88a180d720f4f4b47392059 +clk-renesas f0b62b0bbedcdfde18116080605cebd9beec4ee9 +clk-samsung 45bd8166a1d821eb8fada3092514a7c8543f537c +csky a0793fdad9a11a32bc6d21317c93c83f4aa82ebc +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2 +m68knommu a7904a538933c525096ca2ccde1e60d0ee62c08e +microblaze 7b94b7f0ae246711f22a612a3163aa68a7a2a2f5 +mips 79876cc1d7b801b28511440e5aec1b31d8df7a73 +nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 433fe39f674d58bc7a3e8254a5d2ffc290b7e04e +parisc-hd c7a9608cafefb2ac674660bb51057a8a957d8168 +powerpc beeac538c366cd2828092adecd1edab28326c55b +soc-fsl 67a4fa80561fa2ac26668c14b5c64320bddefda8 +risc-v dacef016c088f8f69fe1e6e5feab3543df3dab83 +s390 f29b15079e35c173a3cd18b9b66d2d529eb7b50e +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml db0dd9cee82270e032123169ceff659eced5115d +xtensa 71874374b46b52d9c44769209f9155313ce60452 +pidfd 317465bcc6f47088cd1152cf524c68dcdd37fb76 +fscrypt b7e072f9b77f4c516df96e0c22ec09f8b2e76ba1 +fscache cdf0fa7e16e2a13978f9bd70c8f5842fa6ded71c +afs 52af7105eceb311b96b3b7971a367f30a70de907 +btrfs 2a578233463d148a115936ce1198ebbc40a1e837 +ceph fd84bfdddd169c219c3a637889a8b87f70a072c2 +cifs 79145d3bc7aa623d70b0e375f724e54046533178 +configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 09c543798c3cde19aae575a0f76d5fc7c130ff18 +exfat 4b095fcf2d43a34ecf67bf6282671e37546010ad +ext3 5f0a61886e30e128976e104a1f4d02b4a750b8aa +ext4 856dd2096e2a01f6eb2c9d60f6e0cd587aa273a8 +f2fs 2b642898e5ea206d04684e55235878ea3425659c +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 073c3ab6ae0123601b5378e8f49c7b8ec4625f32 +gfs2 9fc8bbcbb697c81bc44a433ca3a51c5768e2790d +jfs c48a14dca2cb57527dde6b960adbe69953935f10 +ksmbd d4eeb82674acadf789277b577986e8e7d3faf695 +nfs 064a91771f7aae4ea2d13033b64e921951d216ce +nfs-anna 9ee4f22580f0f5ec00c34c53a479dabfd870644f +nfsd 2e3f00c5f29f033fd5db05ef713d0d9fa27d6db1 +cel abd599feaf6670e3b5dc84fdbfc4ac822a273f45 +ntfs3 52e00ea6b26e45fb8159e3b57cdde8d3f9bdd8e9 +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs 5b0a414d06c3ed2097e32ef7944a4abb644b89bd +ubifs aa39cc675799bc92da153af9a13d6f969c348e82 +v9fs a403e2bd0026a690478719e46bef478777e7dd41 +xfs 6ed6356b07714e0198be3bc3ecccc8b40a212de4 +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap 5ad448ce2976f829d95dcae5e6e91f6686b0e4de +djw-vfs d03ef4daf33a33da8d7c397102fff8ae87d04a93 +file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1 +vfs 8f40da9494cf4dedee1cbbf168b1ce107d3a484d +printk 09b7bafa9876f742446d06b7fb19e7da352aa64a +pci 770851f91de8a987478a916627e43e452937c9a7 +pstore a5d05b07961a2df47d3b4aae3bdae61ac095a43c +hid b92c6c23f16d3dd90b2da1d604c18ae9f2477f20 +i2c 8224d7067becbfdf5f2da0a466d07cbab86cac90 +i3c 3f43926f271287fb1744c9ac9ae1122497f2b0c2 +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging 660d187887cf28bcd71e56008a71657811953189 +jc_docs 82ca67321f55a8d1da6ac3ed611da3c32818bb37 +v4l-dvb 68b9bcc8a534cd11fe55f8bc82f948aae7d81b3c +v4l-dvb-next 68b9bcc8a534cd11fe55f8bc82f948aae7d81b3c +pm 7a716cec17d19211715a34b426aafc3fadb22de6 +cpufreq-arm d776790a55367b9313d03c364c04ff47e7f5ea83 +cpupower e173bc6e950a4b0d9451762ef1afee9b3916e338 +devfreq 4667431419e93b63b4edfe7abdfc96cefcbcc051 +opp 489a00ef46c93e85ed540d91836317cc469371ac +thermal 8ee1c0f6526ce942b7595951c7bb0165010051c2 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm feae43f8aa88309224b27bbe3a59fcb9aefab6f5 +rdma c8f476da84add618b55352194fdd11caaf87c0a7 +net-next 18343b80691560f41c3339119a2e9314d4672c77 +bpf-next e63a02348958cd7cc8c8401c94de57ad97b5d06c +ipsec-next 4e484b3e969b52effd95c17f7a86f39208b2ccf4 +mlx5-next 685b1afd7911676691c4167f420e16a957f5a38e +netfilter-next 2b71e2c7b56cabe0aef95b79af98da921b87bc30 +ipvs-next 2b71e2c7b56cabe0aef95b79af98da921b87bc30 +wireless-drivers-next d430dffbe9dd30759f3c64b65bf85b0245c8d8ab +bluetooth 5d1dd2e5a681b126a04192e37abb2011c2fb719c +mac80211-next 18343b80691560f41c3339119a2e9314d4672c77 +mtd 9ce47e43a0f088653aa25ca465836a84114e0940 +nand 2997e4871621bc56d3c19b447355091dafb6e505 +spi-nor 5f340402bbfc1ee75e7b62b98f6ad85e14ce587c +crypto 4cab5dfd15b77cde2b965bbf71a86876a42684da +drm cb6846fbb83b574c85c2a80211b402a6347b60b1 +drm-misc 5da8b49de472c1da8658466d4f63ef8d9251a819 +amdgpu c4f21bcaf4ac0399946c42229328e3269c1aff46 +drm-intel c65fe9cbbfd61dbc12868f9ed4940c80fcb249e8 +drm-intel-gt c65fe9cbbfd61dbc12868f9ed4940c80fcb249e8 +drm-tegra d210919dbdc8a82c676cc3e3c370b1802be63124 +drm-msm 6ed95285382d6f90a3c3a11d5806a5eb7db715c3 +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv cdd156955f946beaa5f3a00d8ccf90e5a197becc +regmap 02d6fdecb9c38de19065f6bed8d5214556fd061d +sound 57f234248ff925d88caedf4019ec84e6ecb83909 +sound-asoc 9f3d45318dd9e739ed62e4218839a7a824d3cced +modules d457f9e1ae29ef0da7d758e11964b0ddeb438d41 +input 08a6df09063818d55c1f0aa8cf3385d8d217b506 +block bb3294e22482db4b7ec7cfbb2d0f5b53c1adcf86 +device-mapper cba23ac158db7f3cd48a923d6861bee2eb7a2978 +libata 4b03d96711ba3591234e4e73c3b3de15b153673b +pcmcia fffbcee9335ccf97adf2b5b342099b6430e8dbfd +mmc 356f3f2c5756bbb67a515760966a40fc7043cdda +mfd 8ae4069acdee89dd54c3fab93a64cbe51b92fadc +backlight ec961cf3241153e0f27d850f1bf0f172e7d27a21 +battery 25fd330370ac40653671f323acc7fb6db27ef6fe +regulator 1f156b4285865dc2eb66e7a78c7ba80c17bb2b0a +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor 875e5cc6b065416544527fd6548ea9fbe2611625 +integrity 9be6dc8059bb235ffb0666690a26c0df15cc6d9e +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 6cd9d4b97891560b61681cad9cc4307ce0719abc +smack 0934ad42bb2c5df90a1b9de690f93de735b622fe +tomoyo f702e1107601230eec707739038a89018ea3468d +tpmdd 035d19ee9b906f8a6937d44cc1dd1bf065be8641 +watchdog 0c2d62421b5b36e50c4923dee2a3bea6aa7481d6 +iommu 66dc1b791c5839d64d261c8b40250a33e6da050b +audit ed98ea2128b6fd83bce13716edf8f5fe6c47f574 +devicetree 7821f3a0b52519612683a879bdedd0107448d1a2 +mailbox 97961f78e8bc7f50ff7113fec030af6fa5f004d0 +spi ebe33e5a98dcf14a9630845f3f10c193584ac054 +tip 30fddd0b8484a19a6d49503265b2da33f1569ec4 +clockevents 7647204c2e81b28b4a7c4eec7d539f998d48eaf0 +edac 3a8cccd0b51929914512b033cd0257ff84d238d9 +irqchip cd448b24c621b2b676b4fa50a4ab4e9e9da114e2 +ftrace a6ed2aee54644cfa2d04ca86308767f5c3a087e8 +rcu 4dabd7096bfe076d074338d2890b522883f15122 +kvm 5e4e84f1124aa02643833b7ea40abd5a8e964388 +kvm-arm 1c53a1ae36120997a82f936d044c71075852e521 +kvms390 812de04661c4daa7ac385c0dfd62594540538034 +xen-tip bc3bfd76d55ff57d648e65f1a2308ac6f9e6f14b +percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20 +workqueues 7f224759dbdfc6dc2a7e1b1ebcb82208675d118b +drivers-x86 998e7ea8c641fc6bbca1acd478c6824733ac9851 +chrome-platform 297d34e73d491a3edbd6e8c31d33ec90447a908b +hsi a1ee1c08fcd5af03187dcd41dcab12fd5b379555 +leds d949edb503b13a0f05e5931d2340d9e4cfdef264 +ipmi 42e941eae9c0ac24a1f921279f7f128155b865ec +driver-core 28f0c335dd4a1a4b44b3e6c6402825a93132e1a4 +usb 0f663729bb4afc92a9986b66131ebd5b8a9254d1 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 2585cf9dfaaddf00b069673f27bb3f8530e2039c +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty 99a507a8ea28542ec196e2dd80096708e2482735 +char-misc 8f2cade5da97713e77ca5be576438f194b8873d7 +extcon 2da3db7f498d8b6137566b4869d289938b69de13 +phy-next 09d976b3e8e257ff44405b6506bbaae6be1a6b3c +soundwire bb349fd2d58062c69508414a9080d822b8d096b5 +thunderbolt fa487b2a900d7b22fe7db678d2134fbf56ae9da0 +vfio 2bed2ced40c97b8540ff38df0149e8ecb2bf4c65 +staging 0640d18b15d86ab76275e63f36f5841db5f52e74 +iio 38ac2f038666521f94d4fa37b5a9441cef832ccf +mux 949354d5d49ad05fa6596493d3bf4ced84d71169 +icc 01f8938ad036e97802551ea3746fbc5fdc091de6 +dmaengine 2577394f4b01906d345d8b223d1a17cc34e46b46 +cgroup 1815775e74541d7b498c0baf15726ad3d1247abf +scsi 083f067c8257ab97df72541b9910bd1d692c29dc +scsi-mkp c77b1f8a8faeeba43c694d9d09d0b25a4f52cf37 +vhost e2f5041118916cf243bab73ff909846ca592a40a +rpmsg feb19d833fa1bf904c356406d419baf0a6b29a09 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 80f60eba9ceea670092f599a6c90ca2cd7794004 +gpio-intel 9d5f0f6644b1404f40266a2682add712dc9931f5 +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl acd6fb558aa80cf34b120118258e25f3159466b2 +pinctrl-intel db1b2a8caf5b4954aa62ead5b0580948656eac43 +pinctrl-renesas ea7e26ebe6a90fe7962823a70ac91f010df71239 +pinctrl-samsung a382d568f144b9e533ad210117c6c50d8dbdcaf1 +pwm 3f0565451cc0c5158513af0bc4e91aa8fb0b5e75 +userns 2de7290d1e9c05628f206a626862765ed6031d73 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest e89908201e2509354c40158b517945bf3d645812 +livepatching 8cdf3792526ab681e1f4a0c202e779400b2b8177 +coresight efa56eddf5d5c03a90abe708431f16c12c291837 +rtc a12ac1f0ffa41b7aab3f69c4aac5bb72369bd117 +nvdimm 9e05e95ca8dae8de4a7a1645014e1bbd9c8a4dab +at24 d08aea21c89dc2d302cadb5c2cc5410b6c3395c8 +ntb dee871b3979ec343f2db48357754e9a68c86634b +seccomp 1e6d69c7b9cd7735bbf4c6754ccbb9cce8bd8ff4 +kspp 136057256686de39cc3a07c2e39ef6bc43003ff6 +kspp-gustavo 64bc5a949ae1d2ea3f092672146fbd6f7ce67ada +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 547d2167c5c3cd879ed5e86e88cfa7daaf1228a5 +fsi 7cc2f34e1f4da07c791737cc6b3d965b31815ea0 +slimbus fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +nvmem 779809c0732426ecaa83a817eb369efe2e26f2ce +xarray 1c9f4b00b3cf6f5ebb0941a5e5c8d1a3f0a9ba59 +hyperv 2deb55d9f57bb7a877c0d77115cc4077e1e974ff +auxdisplay 4daa9ff89ef27be43c15995412d6aee393a78200 +kgdb b77dbc86d60459b42ab375e4e23172e7245f2854 +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +fpga 98ceca2f29325d6114ea77be719a68c467c103d6 +kunit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +cfi baaf965f94308301d2dc554d72a87d7432cd5ce6 +kunit-next ad659ccb5412874c6a89d3588cb18857c00e9d0f +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +mhi 00776ac534cc9ff95567552ea3f737996d169432 +memblock e888fa7bb882a1f305526d8f49d7016a7bc5f5ca +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust 075c05e2eb5d32881337461ba53652ea675c67f9 +cxl be185c2988b48db65348d94168c793bdbc8d23c3 +folio b45608e6c6db620d54d94bddc11c925ef334dbbe +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +bitmap 785cb064e2f87b6cd2157554f50193dba0642d75 +zstd fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +efi 21e42b00f779ceeac0eb022c747d8f0953805897 +unicode e2a58d2d3416aceeae63dfc7bf680dd390ff331d +slab 08bc9290c7a366cb29f66a6d9840885ec73afabf +random 65d3efef42b46ead728c295bfaf84b0b355501cc +landlock 2585cf9dfaaddf00b069673f27bb3f8530e2039c +akpm-current bd2b315ce5d76694ea040d5368b97f6a585a72ae +akpm 90211350337e3c9aba528b618246a7dd1115e561 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..c2f299c2252e --- /dev/null +++ b/Next/Trees @@ -0,0 +1,351 @@ +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#fixes +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 +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#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#for-usb-fixes +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +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 +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/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.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 +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#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#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/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#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-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +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 +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +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 +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.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.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas 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 +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-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 +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 +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 +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-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 +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +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 +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.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 +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-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 +cel git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +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.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.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 git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +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 +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 +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +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 +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 +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#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +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 +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-intel-gt git git://anongit.freedesktop.org/drm-intel#for-linux-next-gt +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +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/mcgrof/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 +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.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 +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 +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/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 +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#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#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.kernel.org/pub/scm/linux/kernel/git/pdx86/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#for-usb-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 +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#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 +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.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/remoteproc/linux.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 +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +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-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +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 +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.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 +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/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/xarray.git#main +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 +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 +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap +bitmap git https://guthub.com/norov/linux.git#bitmap-master-5.15 +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +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..5eb576d54c08 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,13953 @@ +$ date -R +Wed, 05 Jan 2022 08:38:48 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 61% (6032/9765)
Updating files: 62% (6055/9765)
Updating files: 63% (6152/9765)
Updating files: 64% (6250/9765)
Updating files: 65% (6348/9765)
Updating files: 66% (6445/9765)
Updating files: 67% (6543/9765)
Updating files: 68% (6641/9765)
Updating files: 69% (6738/9765)
Updating files: 70% (6836/9765)
Updating files: 71% (6934/9765)
Updating files: 72% (7031/9765)
Updating files: 73% (7129/9765)
Updating files: 74% (7227/9765)
Updating files: 75% (7324/9765)
Updating files: 76% (7422/9765)
Updating files: 77% (7520/9765)
Updating files: 78% (7617/9765)
Updating files: 79% (7715/9765)
Updating files: 80% (7812/9765)
Updating files: 81% (7910/9765)
Updating files: 82% (8008/9765)
Updating files: 83% (8105/9765)
Updating files: 84% (8203/9765)
Updating files: 85% (8301/9765)
Updating files: 86% (8398/9765)
Updating files: 87% (8496/9765)
Updating files: 88% (8594/9765)
Updating files: 89% (8691/9765)
Updating files: 90% (8789/9765)
Updating files: 91% (8887/9765)
Updating files: 92% (8984/9765)
Updating files: 93% (9082/9765)
Updating files: 94% (9180/9765)
Updating files: 95% (9277/9765)
Updating files: 96% (9375/9765)
Updating files: 97% (9473/9765)
Updating files: 98% (9570/9765)
Updating files: 99% (9668/9765)
Updating files: 100% (9765/9765)
Updating files: 100% (9765/9765), done. +HEAD is now at c9e6606c7fe9 Linux 5.16-rc8 +Merging origin/master (c9e6606c7fe9 Linux 5.16-rc8) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Already up to date. +Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging kbuild-current/fixes (e851dfae4371 Merge tag 'kgdb-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (8f67f65d121c arc: use swap() to make code cleaner) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/include/asm/irqflags-compact.h | 8 +- + arch/arc/include/asm/perf_event.h | 162 ------------------------------- + arch/arc/include/asm/thread_info.h | 4 +- + arch/arc/kernel/perf_event.c | 166 +++++++++++++++++++++++++++++++- + arch/arc/kernel/unwind.c | 11 +-- + arch/arc/mm/dma.c | 2 +- + arch/arc/plat-axs10x/axs10x.c | 2 +- + arch/arc/plat-hsdk/platform.c | 2 +- + 8 files changed, 178 insertions(+), 179 deletions(-) +Merging arm-current/fixes (8536a5ef8860 ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (9c5d89bc1055 arm64: kexec: Fix missing error code 'ret' warning in load_other_segments()) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (7ad8b2fcb850 Merge tag 'imx-fixes-5.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (8c5ba21c16bd memory: mtk-smi: Fix a null dereference for the ostd) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Merge made by the 'recursive' strategy. +Merging tee-fixes/fixes (d58071a8a76d Linux 5.16-rc3) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (8d84fca4375e powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (4eb1782eaa9f recordmcount.pl: fix typo in s390 mcount regex) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (6f89ecf10af1 Merge tag 'mac80211-for-net-2022-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/amazon/ena/ena_netdev.c | 49 +++++++----- + drivers/net/ethernet/freescale/xgmac_mdio.c | 1 - + drivers/net/phy/fixed_phy.c | 4 +- + drivers/net/usb/rndis_host.c | 5 ++ + include/linux/ipv6.h | 2 + + include/net/sctp/sctp.h | 3 +- + include/net/seg6.h | 21 +++++ + net/batman-adv/multicast.c | 15 ++-- + net/batman-adv/multicast.h | 10 ++- + net/batman-adv/soft-interface.c | 7 +- + net/core/lwtunnel.c | 4 + + net/ipv4/fib_semantics.c | 49 ++++++++++-- + net/ipv6/icmp.c | 6 +- + net/ipv6/route.c | 32 +++++++- + net/ipv6/seg6.c | 59 ++++++++++++++ + net/ipv6/seg6_local.c | 33 +------- + net/ipv6/udp.c | 3 +- + net/mac80211/ieee80211_i.h | 24 +++++- + net/mac80211/mesh.h | 22 +----- + net/mac80211/mesh_pathtbl.c | 89 ++++++++-------------- + net/mac80211/mlme.c | 2 +- + net/mctp/neigh.c | 9 ++- + net/netrom/af_netrom.c | 2 +- + net/sched/sch_qfq.c | 6 +- + net/sctp/diag.c | 46 +++++------ + net/sctp/socket.c | 22 ++++-- + net/tipc/socket.c | 2 + + net/xdp/xsk.c | 4 +- + .../selftests/bpf/verifier/value_ptr_arith.c | 2 +- + tools/testing/selftests/net/udpgro_fwd.sh | 3 +- + 30 files changed, 332 insertions(+), 204 deletions(-) +Merging bpf/master (d6d86830705f net ticp:fix a kernel-infoleak in __tipc_sendmsg()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (68ac0f3810e7 xfrm: state and policy should fail if XFRMA_IF_ID 0) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 2 +- + net/ipv6/ip6_gre.c | 5 ++++- + net/xfrm/xfrm_interface.c | 14 ++++++++++++-- + net/xfrm/xfrm_policy.c | 21 +++++++++++++++++++++ + net/xfrm/xfrm_user.c | 23 +++++++++++++++++++---- + 5 files changed, 57 insertions(+), 8 deletions(-) +Merging netfilter/master (5471d5226c3b selftests: Calculate udpgso segment count without header adjustment) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (5471d5226c3b selftests: Calculate udpgso segment count without header adjustment) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless-drivers/master (f7d55d2e439f mt76: mt7921: fix build regression) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git wireless-drivers/master +Already up to date. +Merging mac80211/master (6f89ecf10af1 Merge tag 'mac80211-for-net-2022-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (c9e6606c7fe9 Linux 5.16-rc8) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (08977fe8cfb7 ALSA: hda/realtek: Use ALC285_FIXUP_HP_GPIO_LED on another HP laptop) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging sound-asoc-fixes/for-linus (c9d633f3257e Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging regmap-fixes/for-linus (459e1cd0d5ec Merge remote-tracking branch 'regmap/for-5.15' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merge made by the 'recursive' strategy. +Merging regulator-fixes/for-linus (85223d609c99 regulator: dt-bindings: samsung,s5m8767: add missing op_mode to bucks) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (6210a7a0f2cd Merge remote-tracking branch 'spi/for-5.15' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-uniphier.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) +Merging pci-current/for-linus (87620512681a PCI: apple: Fix PERST# polarity) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (136057256686 Linux 5.16-rc2) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (a7904a538933 Linux 5.16-rc6) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (c9e6606c7fe9 Linux 5.16-rc8) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (a7904a538933 Linux 5.16-rc6) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) +$ git merge -m Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-fixes/for-usb-fixes +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +CONFLICT (content): Merge conflict in drivers/usb/chipidea/ci_hdrc_imx.c +Resolved 'drivers/usb/chipidea/ci_hdrc_imx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5673981a28a3] Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git +$ git diff -M --stat --summary HEAD^.. +Merging phy/fixes (f0ae8685b285 phy: HiSilicon: Fix copy and paste bug in error handling) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (d58071a8a76d Linux 5.16-rc3) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (8f80931a3a4d iio: adc: ti-adc081c: Partial revert of removal of ACPI IDs) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'recursive' strategy. + drivers/iio/adc/ti-adc081c.c | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) +Merging char-misc.current/char-misc-linus (c9e6606c7fe9 Linux 5.16-rc8) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (c9e6606c7fe9 Linux 5.16-rc8) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (bc7ec91718c4 Input: spaceball - fix parsing of movement data packets) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (27750a315aba crypto: qat - do not handle PFVF sources for qat_4xxx) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (8704e8934908 vfio/pci: Fix OpRegion read) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (2a987e65025e Merge tag 'perf-tools-fixes-for-v5.16-2021-12-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (822c9f2b833c dmaengine: st_fdma: fix MODULE_ALIAS) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (27a030e87292 mtd: dataflash: Add device-tree SPI IDs) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (d40f0b133b44 media: meson-ir-tx: remove incorrect doc comment) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/platform/rockchip/rga/rga.c | 2 +- + drivers/media/rc/meson-ir-tx.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging reset-fixes/reset/fixes (92c959bae2e5 reset: renesas: Fix Runtime PM usage) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Merge made by the 'recursive' strategy. + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging mips-fixes/mips-fixes (09d97da660ff MIPS: Only define pci_remap_iospace() for Ralink) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (80d680fdccba ARM: dts: omap3430-sdp: Fix NAND device node) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (fdba608f15e2 KVM: VMX: Wake vCPU when delivering posted IRQ even if vCPU == this vCPU) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (fc74e0a40e4f Linux 5.16-rc7) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (3dd60fb9d95d nvdimm/pmem: stop using q_usage_count as external pgmap refcount) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (c748b846dab6 Merge branch 'misc-5.16' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Already up to date. +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (25f54d08f12f autofs: fix wait name hash calculation in autofs_wait()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (26a8b0943780 platform/x86: intel_pmc_core: fix memleak on registration failure) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (4f5d06d381ba arm64: dts: exynos: drop samsung,ufs-shareability-reg-offset in ExynosAutov9) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Merge made by the 'recursive' strategy. +Merging pinctrl-samsung-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (b398123bff3b efi: apply memblock cap after memblock_add()) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + drivers/firmware/efi/efi-init.c | 5 +++++ + drivers/of/fdt.c | 19 +++++++++++++------ + include/linux/of_fdt.h | 2 ++ + 3 files changed, 20 insertions(+), 6 deletions(-) +Merging scsi-fixes/fixes (142c779d05d1 scsi: vmw_pvscsi: Set residual data length conditionally) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (ce9b333c73a5 Merge branch 'drm-misc-fixes' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git 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 -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (c9e6606c7fe9 Linux 5.16-rc8) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (ff31ee0a0f47 mmc: mmci: stm32: clear DLYB_CR after sending tuning command) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'recursive' strategy. +Merging gnss-fixes/gnss-linus (136057256686 Linux 5.16-rc2) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (1dc2f2b81a6a hv: utils: add PTP_1588_CLOCK to Kconfig to fix build) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (7e5e744183bb soc: fsl: dpio: fix qbman alignment error in the virtualization context) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Auto-merging drivers/soc/fsl/dpio/qbman-portal.c +Merge made by the 'recursive' strategy. + drivers/soc/fsl/dpio/qbman-portal.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) +Merging risc-v-fixes/fixes (f6f7fbb89bf8 riscv: dts: sifive unmatched: Link the tmp451 with its power supply) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (bc128349588d LICENSES/LGPL-2.1: Add LGPL-2.1-or-later as valid identifiers) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Merge made by the 'recursive' strategy. + LICENSES/preferred/LGPL-2.1 | 2 ++ + 1 file changed, 2 insertions(+) +Merging gpio-brgl-fixes/gpio/for-current (32e246b02f53 MAINTAINERS: update gpio-brcmstb maintainers) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + drivers/gpio/gpio-aspeed-sgpio.c | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging gpio-intel-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (57bbeacdbee7 erofs: fix deadlock when shrink erofs slab) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (d7f55471db27 memblock: fix memblock_phys_alloc() section mismatch error) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (53b1119a6e50 NFSD: Fix READDIR buffer overflow) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (c3fbab7767c5 irqchip/irq-bcm7120-l2: Add put_device() after of_find_device_by_node()) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (c9e6606c7fe9 Linux 5.16-rc8) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (4bc5e64e6cf3 efi: Move efifb_setup_from_dmi() prototype from arch headers) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (d58071a8a76d Linux 5.16-rc3) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (22bf4047d269 dt-bindings: display: meson-dw-hdmi: add missing sound-name-prefix property) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml | 5 +++++ + Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml | 6 ++++++ + 2 files changed, 11 insertions(+) +Merging kbuild/for-next (4dc0759c563a init/Kconfig: Drop linker version check for LD_ORPHAN_WARN) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Documentation/process/changes.rst +Merge made by the 'recursive' strategy. + Documentation/process/changes.rst | 2 +- + arch/Kconfig | 3 +-- + arch/arm/Kconfig.debug | 2 -- + include/linux/slab.h | 3 +-- + init/Kconfig | 1 - + kernel/gcov/Kconfig | 1 - + scripts/kconfig/Makefile | 3 ++- + scripts/kconfig/conf.c | 17 ++++++++++------- + scripts/kconfig/streamline_config.pl | 2 +- + scripts/min-tool-version.sh | 2 +- + 10 files changed, 17 insertions(+), 19 deletions(-) +Merging perf/perf/core (b9f6fbb3b2c2 perf arm64: Inject missing frames when using 'perf record --call-graph=fp') +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Auto-merging tools/perf/builtin-script.c +Merge made by the 'recursive' strategy. + tools/build/Build.include | 2 +- + tools/lib/perf/evlist.c | 15 +- + tools/lib/perf/evsel.c | 19 + + tools/lib/perf/include/internal/evlist.h | 2 +- + tools/lib/perf/include/perf/evsel.h | 4 + + tools/lib/perf/libperf.map | 1 + + tools/lib/perf/mmap.c | 2 - + tools/lib/perf/tests/test-evlist.c | 157 +++++ + tools/perf/Documentation/perf-list.txt | 48 +- + tools/perf/Documentation/perf-record.txt | 6 +- + tools/perf/Documentation/perf-stat.txt | 10 +- + tools/perf/Documentation/perf-top.txt | 7 +- + tools/perf/Makefile.config | 10 +- + tools/perf/Makefile.perf | 4 +- + tools/perf/arch/arm/include/perf_regs.h | 42 -- + tools/perf/arch/arm/util/cs-etm.c | 19 - + tools/perf/arch/arm64/include/perf_regs.h | 78 +-- + tools/perf/arch/arm64/util/machine.c | 7 + + tools/perf/arch/csky/include/perf_regs.h | 82 --- + tools/perf/arch/mips/include/perf_regs.h | 69 --- + tools/perf/arch/powerpc/include/perf_regs.h | 66 -- + tools/perf/arch/riscv/include/perf_regs.h | 74 --- + tools/perf/arch/s390/include/perf_regs.h | 78 --- + tools/perf/arch/x86/include/perf_regs.h | 82 --- + tools/perf/arch/x86/util/evlist.c | 17 + + tools/perf/builtin-bench.c | 5 +- + tools/perf/builtin-ftrace.c | 445 +++++++++++--- + tools/perf/builtin-record.c | 8 + + tools/perf/builtin-report.c | 4 +- + tools/perf/builtin-script.c | 31 +- + tools/perf/builtin-stat.c | 24 + + tools/perf/builtin-trace.c | 3 + + tools/perf/dlfilters/dlfilter-test-api-v0.c | 2 - + .../arch/arm64/arm/neoverse-n2/branch.json | 8 + + .../pmu-events/arch/arm64/arm/neoverse-n2/bus.json | 20 + + .../arch/arm64/arm/neoverse-n2/cache.json | 155 +++++ + .../arch/arm64/arm/neoverse-n2/exception.json | 47 ++ + .../arch/arm64/arm/neoverse-n2/instruction.json | 143 +++++ + .../arch/arm64/arm/neoverse-n2/memory.json | 38 ++ + .../arch/arm64/arm/neoverse-n2/other.json | 5 + + .../arch/arm64/arm/neoverse-n2/pipeline.json | 23 + + .../pmu-events/arch/arm64/arm/neoverse-n2/spe.json | 14 + + .../arch/arm64/arm/neoverse-n2/trace.json | 29 + + ...nd-microarch.json => common-and-microarch.json} | 198 ++++++ + tools/perf/pmu-events/arch/arm64/mapfile.csv | 1 + + .../{armv8-recommended.json => recommended.json} | 202 +++---- + tools/perf/tests/Build | 1 + + tools/perf/tests/builtin-test.c | 16 +- + tools/perf/tests/sigtrap.c | 177 ++++++ + tools/perf/tests/tests.h | 1 + + tools/perf/util/Build | 2 + + tools/perf/util/arm-spe-decoder/arm-spe-decoder.c | 2 + + tools/perf/util/arm-spe-decoder/arm-spe-decoder.h | 1 + + tools/perf/util/arm-spe.c | 67 ++- + .../perf/util/arm64-frame-pointer-unwind-support.c | 63 ++ + .../perf/util/arm64-frame-pointer-unwind-support.h | 10 + + tools/perf/util/bpf-loader.c | 15 +- + tools/perf/util/bpf_ftrace.c | 152 +++++ + tools/perf/util/bpf_skel/func_latency.bpf.c | 114 ++++ + tools/perf/util/callchain.c | 14 +- + tools/perf/util/callchain.h | 4 +- + tools/perf/util/evlist.h | 2 + + tools/perf/util/evsel.c | 19 - + tools/perf/util/evsel.h | 3 - + tools/perf/util/ftrace.h | 81 +++ + tools/perf/util/libunwind/arm64.c | 2 + + tools/perf/util/machine.c | 50 +- + tools/perf/util/machine.h | 1 + + tools/perf/util/metricgroup.c | 42 +- + tools/perf/util/namespaces.c | 76 ++- + tools/perf/util/namespaces.h | 2 + + tools/perf/util/parse-events-hybrid.c | 9 +- + tools/perf/util/parse-events.c | 10 +- + tools/perf/util/perf_regs.c | 666 +++++++++++++++++++++ + tools/perf/util/perf_regs.h | 17 +- + .../util/scripting-engines/trace-event-python.c | 10 +- + tools/perf/util/session.c | 25 +- + 77 files changed, 3042 insertions(+), 918 deletions(-) + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/branch.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/bus.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/exception.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/instruction.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/memory.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/other.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/spe.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/trace.json + rename tools/perf/pmu-events/arch/arm64/{armv8-common-and-microarch.json => common-and-microarch.json} (76%) + rename tools/perf/pmu-events/arch/arm64/{armv8-recommended.json => recommended.json} (96%) + create mode 100644 tools/perf/tests/sigtrap.c + create mode 100644 tools/perf/util/arm64-frame-pointer-unwind-support.c + create mode 100644 tools/perf/util/arm64-frame-pointer-unwind-support.h + create mode 100644 tools/perf/util/bpf_ftrace.c + create mode 100644 tools/perf/util/bpf_skel/func_latency.bpf.c + create mode 100644 tools/perf/util/ftrace.h +Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (f857acfc457e lib/scatterlist: cleanup macros into static inline functions) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'recursive' strategy. + include/linux/scatterlist.h | 29 ++++-- + kernel/dma/direct.c | 240 ++++++++++++++++++++++++++------------------ + 2 files changed, 163 insertions(+), 106 deletions(-) +Merging asm-generic/master (733e417518a6 asm-generic/error-injection.h: fix a spelling mistake, and a coding style issue) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cifs/usage.rst | 7 +++---- + Documentation/admin-guide/devices.txt | 8 +------- + arch/arm/configs/cm_x300_defconfig | 1 - + arch/arm/configs/ezx_defconfig | 1 - + arch/arm/configs/imote2_defconfig | 1 - + arch/arm/configs/nhk8815_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/configs/spear13xx_defconfig | 1 - + arch/arm/configs/spear3xx_defconfig | 1 - + arch/arm/configs/spear6xx_defconfig | 1 - + arch/mips/configs/decstation_64_defconfig | 1 - + arch/mips/configs/decstation_defconfig | 1 - + arch/mips/configs/decstation_r4k_defconfig | 1 - + arch/mips/configs/fuloong2e_defconfig | 1 - + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/malta_qemu_32r6_defconfig | 1 - + arch/mips/configs/maltaaprp_defconfig | 1 - + arch/mips/configs/maltasmvp_defconfig | 1 - + arch/mips/configs/maltasmvp_eva_defconfig | 1 - + arch/mips/configs/maltaup_defconfig | 1 - + arch/mips/configs/maltaup_xpa_defconfig | 1 - + arch/powerpc/configs/pmac32_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/sh/configs/titan_defconfig | 1 - + include/asm-generic/error-injection.h | 4 ++-- + 28 files changed, 6 insertions(+), 38 deletions(-) +Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (e00dd02c0e0f Merge branch 'devel-stable' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging drivers/irqchip/irq-nvic.c +Removing arch/arm/mach-rpc/include/mach/entry-macro.S +Removing arch/arm/mach-iop32x/include/mach/entry-macro.S +Removing arch/arm/mach-footbridge/include/mach/entry-macro.S +Removing arch/arm/include/asm/hardware/entry-macro-iomd.S +Removing arch/arm/include/asm/entry-macro-multi.S +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + .../core/thread-info-in-task/arch-support.txt | 2 +- + arch/arm/Kconfig | 32 ++-- + arch/arm/Kconfig.debug | 11 ++ + arch/arm/Makefile | 9 + + arch/arm/boot/compressed/.gitignore | 5 - + arch/arm/boot/compressed/Makefile | 39 +--- + arch/arm/boot/compressed/ashldi3.S | 3 + + arch/arm/boot/compressed/bswapsdi2.S | 3 + + arch/arm/boot/compressed/efi-header.S | 22 ++- + arch/arm/boot/compressed/font.c | 2 + + arch/arm/boot/compressed/head.S | 3 +- + arch/arm/boot/compressed/hyp-stub.S | 2 + + arch/arm/boot/compressed/lib1funcs.S | 3 + + arch/arm/boot/compressed/misc.c | 7 - + arch/arm/include/asm/assembler.h | 204 ++++++++++++++++---- + arch/arm/include/asm/current.h | 37 ++-- + arch/arm/include/asm/elf.h | 3 + + arch/arm/include/asm/entry-macro-multi.S | 40 ---- + arch/arm/include/asm/hardware/entry-macro-iomd.S | 131 ------------- + arch/arm/include/asm/insn.h | 24 +++ + arch/arm/include/asm/irq.h | 1 - + arch/arm/include/asm/kfence.h | 53 ++++++ + arch/arm/include/asm/mach/arch.h | 2 - + arch/arm/include/asm/page.h | 4 + + arch/arm/include/asm/percpu.h | 25 ++- + arch/arm/include/asm/set_memory.h | 1 + + arch/arm/include/asm/smp.h | 5 - + arch/arm/include/asm/stacktrace.h | 12 ++ + arch/arm/include/asm/switch_to.h | 17 +- + arch/arm/include/asm/thread_info.h | 35 +--- + arch/arm/include/asm/tls.h | 13 +- + arch/arm/include/asm/v7m.h | 3 +- + arch/arm/kernel/asm-offsets.c | 3 - + arch/arm/kernel/entry-armv.S | 209 +++++++++++++++++---- + arch/arm/kernel/entry-common.S | 16 +- + arch/arm/kernel/entry-header.S | 48 ++++- + arch/arm/kernel/entry-v7m.S | 39 ++-- + arch/arm/kernel/head-common.S | 4 +- + arch/arm/kernel/irq.c | 61 ++++-- + arch/arm/kernel/module.c | 85 +++++++++ + arch/arm/kernel/process.c | 7 +- + arch/arm/kernel/setup.c | 8 +- + arch/arm/kernel/sleep.S | 6 + + arch/arm/kernel/smp.c | 19 +- + arch/arm/kernel/traps.c | 115 +++++++++++- + arch/arm/kernel/unwind.c | 50 +++-- + arch/arm/kernel/vmlinux.lds.S | 4 +- + arch/arm/lib/backtrace-clang.S | 14 +- + arch/arm/lib/backtrace.S | 8 + + arch/arm/lib/call_with_stack.S | 33 +++- + arch/arm/lib/copy_from_user.S | 13 +- + arch/arm/lib/copy_template.S | 67 +++---- + arch/arm/lib/copy_to_user.S | 13 +- + arch/arm/lib/memcpy.S | 13 +- + arch/arm/lib/memmove.S | 60 ++---- + arch/arm/lib/memset.S | 7 +- + arch/arm/mach-footbridge/common.c | 87 +++++++++ + .../arm/mach-footbridge/include/mach/entry-macro.S | 107 ----------- + arch/arm/mach-iop32x/cp6.c | 10 +- + arch/arm/mach-iop32x/include/mach/entry-macro.S | 31 --- + arch/arm/mach-iop32x/include/mach/irqs.h | 2 +- + arch/arm/mach-iop32x/iop3xx.h | 1 + + arch/arm/mach-iop32x/irq.c | 29 ++- + arch/arm/mach-iop32x/irqs.h | 60 +++--- + arch/arm/mach-rpc/fiq.S | 5 +- + arch/arm/mach-rpc/include/mach/entry-macro.S | 13 -- + arch/arm/mach-rpc/irq.c | 95 ++++++++++ + arch/arm/mm/Kconfig | 1 + + arch/arm/mm/fault.c | 20 +- + arch/arm/mm/pageattr.c | 42 ++++- + arch/arm/mm/proc-v7m.S | 20 ++ + drivers/amba/bus.c | 71 +++---- + drivers/irqchip/Kconfig | 1 + + drivers/irqchip/irq-nvic.c | 22 +-- + scripts/remove-stale-files | 2 +- + 75 files changed, 1417 insertions(+), 857 deletions(-) + create mode 100644 arch/arm/boot/compressed/ashldi3.S + create mode 100644 arch/arm/boot/compressed/bswapsdi2.S + create mode 100644 arch/arm/boot/compressed/font.c + create mode 100644 arch/arm/boot/compressed/hyp-stub.S + create mode 100644 arch/arm/boot/compressed/lib1funcs.S + delete mode 100644 arch/arm/include/asm/entry-macro-multi.S + delete mode 100644 arch/arm/include/asm/hardware/entry-macro-iomd.S + create mode 100644 arch/arm/include/asm/kfence.h + delete mode 100644 arch/arm/mach-footbridge/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-iop32x/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-rpc/include/mach/entry-macro.S +Merging arm64/for-next/core (52d3ff9d3658 Merge branches 'for-next/misc', 'for-next/cache-ops-dzp', 'for-next/stacktrace', 'for-next/xor-neon', 'for-next/kasan', 'for-next/armv8_7-fp', 'for-next/atomics', 'for-next/bti', 'for-next/sve', 'for-next/kselftest' and 'for-next/kcsan', remote-tracking branch 'arm64/for-next/perf' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/perf/hisi-pcie-pmu.rst | 106 ++ + Documentation/admin-guide/sysctl/kernel.rst | 11 + + Documentation/arm64/cpu-feature-registers.rst | 17 + + Documentation/arm64/elf_hwcaps.rst | 8 + + Documentation/arm64/perf.rst | 78 +- + Documentation/arm64/sve.rst | 2 +- + Documentation/arm64/tagged-address-abi.rst | 2 +- + .../devicetree/bindings/perf/arm,cmn.yaml | 21 +- + .../devicetree/bindings/perf/arm,smmu-v3-pmcg.yaml | 70 ++ + .../bindings/perf/marvell-cn10k-tad.yaml | 63 ++ + Documentation/memory-barriers.txt | 8 + + MAINTAINERS | 2 + + arch/arm64/Kconfig | 8 + + arch/arm64/Makefile | 5 + + arch/arm64/crypto/aes-modes.S | 10 +- + arch/arm64/include/asm/assembler.h | 10 + + arch/arm64/include/asm/atomic_ll_sc.h | 86 +- + arch/arm64/include/asm/atomic_lse.h | 270 ++--- + arch/arm64/include/asm/barrier.h | 9 + + arch/arm64/include/asm/cpu.h | 1 + + arch/arm64/include/asm/fpsimd.h | 6 +- + arch/arm64/include/asm/hwcap.h | 2 + + arch/arm64/include/asm/linkage.h | 35 +- + arch/arm64/include/asm/mte-kasan.h | 8 +- + arch/arm64/include/asm/stacktrace.h | 10 +- + arch/arm64/include/asm/sysreg.h | 16 + + arch/arm64/include/uapi/asm/hwcap.h | 2 + + arch/arm64/kernel/acpi.c | 35 +- + arch/arm64/kernel/cpufeature.c | 13 + + arch/arm64/kernel/cpuinfo.c | 3 + + arch/arm64/kernel/entry-ftrace.S | 8 +- + arch/arm64/kernel/entry.S | 6 +- + arch/arm64/kernel/fpsimd.c | 69 +- + arch/arm64/kernel/machine_kexec.c | 6 +- + arch/arm64/kernel/perf_callchain.c | 15 +- + arch/arm64/kernel/perf_event.c | 245 +++-- + arch/arm64/kernel/process.c | 84 +- + arch/arm64/kernel/ptrace.c | 4 +- + arch/arm64/kernel/return_address.c | 8 +- + arch/arm64/kernel/setup.c | 7 +- + arch/arm64/kernel/stacktrace.c | 60 +- + arch/arm64/kernel/time.c | 25 +- + arch/arm64/kernel/vdso/Makefile | 1 + + arch/arm64/kvm/handle_exit.c | 5 +- + arch/arm64/kvm/hyp/nvhe/Makefile | 1 + + arch/arm64/kvm/reset.c | 8 +- + arch/arm64/kvm/sys_regs.c | 2 +- + arch/arm64/lib/clear_page.S | 10 + + arch/arm64/lib/kasan_sw_tags.S | 4 +- + arch/arm64/lib/mte.S | 8 +- + arch/arm64/lib/xor-neon.c | 147 ++- + arch/arm64/mm/cache.S | 24 +- + arch/arm64/mm/context.c | 22 +- + arch/arm64/mm/extable.c | 3 - + arch/arm64/mm/fault.c | 9 +- + arch/powerpc/kernel/Makefile | 3 +- + arch/riscv/kernel/stacktrace.c | 4 - + arch/s390/kernel/Makefile | 3 +- + arch/x86/events/core.c | 10 +- + arch/x86/events/perf_event.h | 2 +- + arch/x86/kernel/Makefile | 2 +- + drivers/perf/Kconfig | 9 +- + drivers/perf/Makefile | 1 + + drivers/perf/arm-cmn.c | 1111 +++++++++++++------- + drivers/perf/arm_smmuv3_pmu.c | 66 +- + drivers/perf/hisilicon/Kconfig | 9 + + drivers/perf/hisilicon/Makefile | 2 + + drivers/perf/hisilicon/hisi_pcie_pmu.c | 948 +++++++++++++++++ + drivers/perf/marvell_cn10k_tad_pmu.c | 429 ++++++++ + include/asm-generic/barrier.h | 11 + + include/linux/cpuhotplug.h | 1 + + include/linux/perf_event.h | 10 + + include/linux/stacktrace.h | 35 +- + kernel/events/core.c | 4 + + kernel/kcsan/Makefile | 1 + + tools/testing/selftests/arm64/Makefile | 2 +- + tools/testing/selftests/arm64/abi/.gitignore | 1 + + tools/testing/selftests/arm64/abi/Makefile | 8 + + .../testing/selftests/arm64/abi/syscall-abi-asm.S | 240 +++++ + tools/testing/selftests/arm64/abi/syscall-abi.c | 318 ++++++ + tools/testing/selftests/arm64/fp/.gitignore | 1 + + tools/testing/selftests/arm64/fp/Makefile | 4 +- + tools/testing/selftests/arm64/fp/fp-pidbench.S | 71 ++ + tools/testing/selftests/arm64/fp/sve-ptrace.c | 219 ++-- + .../selftests/arm64/signal/test_signals_utils.c | 12 +- + 85 files changed, 4171 insertions(+), 1064 deletions(-) + create mode 100644 Documentation/admin-guide/perf/hisi-pcie-pmu.rst + create mode 100644 Documentation/devicetree/bindings/perf/arm,smmu-v3-pmcg.yaml + create mode 100644 Documentation/devicetree/bindings/perf/marvell-cn10k-tad.yaml + create mode 100644 drivers/perf/hisilicon/hisi_pcie_pmu.c + create mode 100644 drivers/perf/marvell_cn10k_tad_pmu.c + create mode 100644 tools/testing/selftests/arm64/abi/.gitignore + create mode 100644 tools/testing/selftests/arm64/abi/Makefile + create mode 100644 tools/testing/selftests/arm64/abi/syscall-abi-asm.S + create mode 100644 tools/testing/selftests/arm64/abi/syscall-abi.c + create mode 100644 tools/testing/selftests/arm64/fp/fp-pidbench.S +Merging arm-perf/for-next/perf (1609c22a8a09 Merge branch 'for-next/perf-cpu' into for-next/perf) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (49b721df4e3d Merge branch 'arm/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Removing include/linux/platform_data/pata_ixp4xx_cf.h +Auto-merging drivers/mmc/host/sdhci-tegra.c +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/thermal/nvidia,tegra186-bpmp-thermal.txt +Removing Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt +Removing Documentation/devicetree/bindings/serial/nvidia,tegra194-tcu.txt +Removing Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt +Removing Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt +Removing Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.txt +Removing Documentation/devicetree/bindings/misc/nvidia,tegra186-misc.txt +Removing Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt +Removing Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.txt +Removing Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt +Removing Documentation/devicetree/bindings/firmware/nvidia,tegra186-bpmp.txt +Removing Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt +Resolved 'arch/arm/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0d493e9c17d9] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/apple.yaml | 27 +- + .../devicetree/bindings/arm/apple/apple,pmgr.yaml | 134 + + .../devicetree/bindings/arm/aspeed/aspeed,sbc.yaml | 37 + + .../devicetree/bindings/arm/bcm/brcm,bcm4908.yaml | 1 + + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + + .../bindings/arm/firmware/linaro,optee-tz.yaml | 8 + + Documentation/devicetree/bindings/arm/fsl.yaml | 78 + + .../devicetree/bindings/arm/mediatek.yaml | 20 + + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 2 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 14 + + Documentation/devicetree/bindings/arm/renesas.yaml | 12 + + .../bindings/arm/samsung/samsung-boards.yaml | 12 + + .../devicetree/bindings/arm/stm32/stm32.yaml | 1 + + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + .../arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 91 +- + Documentation/devicetree/bindings/arm/tegra.yaml | 48 +- + .../bindings/arm/tegra/nvidia,tegra186-pmc.txt | 133 - + .../bindings/arm/tegra/nvidia,tegra186-pmc.yaml | 198 + + Documentation/devicetree/bindings/arm/ti/k3.yaml | 6 + + .../devicetree/bindings/bus/fsl,spba-bus.yaml | 68 + + Documentation/devicetree/bindings/bus/imx-weim.txt | 5 + + .../bindings/clock/nvidia,tegra20-car.yaml | 37 + + .../devicetree/bindings/clock/qcom,gcc-sdx65.yaml | 80 + + .../devicetree/bindings/clock/qcom,gcc-sm8450.yaml | 85 + + .../bindings/clock/starfive,jh7100-clkgen.yaml | 56 + + .../crypto/allwinner,sun4i-a10-crypto.yaml | 10 + + .../display/tegra/nvidia,tegra20-host1x.txt | 53 + + .../bindings/firmware/nvidia,tegra186-bpmp.txt | 107 - + .../bindings/firmware/nvidia,tegra186-bpmp.yaml | 186 + + .../devicetree/bindings/firmware/qcom,scm.txt | 2 + + .../bindings/fuse/nvidia,tegra20-fuse.txt | 42 - + .../bindings/fuse/nvidia,tegra20-fuse.yaml | 89 + + .../bindings/gpu/host1x/nvidia,tegra210-nvenc.yaml | 135 + + .../bindings/gpu/host1x/nvidia,tegra210-nvjpg.yaml | 94 + + .../devicetree/bindings/i2c/apple,i2c.yaml | 7 +- + .../bindings/interrupt-controller/apple,aic.yaml | 3 + + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../devicetree/bindings/iommu/apple,dart.yaml | 3 + + .../bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 2 + + .../devicetree/bindings/mailbox/apple,mailbox.yaml | 3 + + .../bindings/mailbox/nvidia,tegra186-hsp.txt | 72 - + .../bindings/mailbox/nvidia,tegra186-hsp.yaml | 114 + + .../devicetree/bindings/media/nvidia,tegra-vde.txt | 64 - + .../bindings/media/nvidia,tegra-vde.yaml | 119 + + .../memory-controllers/nvidia,tegra186-mc.yaml | 98 +- + .../memory-controllers/renesas,rpc-if.yaml | 54 +- + .../bindings/misc/nvidia,tegra186-misc.txt | 14 - + .../bindings/misc/nvidia,tegra186-misc.yaml | 43 + + .../bindings/misc/nvidia,tegra20-apbmisc.txt | 17 - + .../bindings/misc/nvidia,tegra20-apbmisc.yaml | 51 + + .../bindings/mmc/nvidia,tegra20-sdhci.txt | 143 - + .../bindings/mmc/nvidia,tegra20-sdhci.yaml | 317 + + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 48 +- + .../devicetree/bindings/pci/apple,pcie.yaml | 28 +- + .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 7 +- + .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 307 + + .../bindings/power/apple,pmgr-pwrstate.yaml | 79 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 3 + + .../bindings/power/renesas,rcar-sysc.yaml | 1 + + .../devicetree/bindings/reset/renesas,rst.yaml | 1 + + .../bindings/reset/starfive,jh7100-reset.yaml | 38 + + .../devicetree/bindings/rtc/nvidia,tegra20-rtc.txt | 24 - + .../bindings/rtc/nvidia,tegra20-rtc.yaml | 61 + + Documentation/devicetree/bindings/serial/8250.yaml | 3 +- + .../bindings/serial/nvidia,tegra194-tcu.txt | 35 - + .../bindings/serial/nvidia,tegra194-tcu.yaml | 61 + + .../bindings/serial/snps-dw-apb-uart.yaml | 5 + + .../bindings/soc/bcm/brcm,bcm2835-vchiq.txt | 17 - + .../bindings/soc/bcm/brcm,bcm2835-vchiq.yaml | 53 + + .../bindings/soc/imx/fsl,imx8mn-disp-blk-ctrl.yaml | 97 + + .../devicetree/bindings/soc/qcom/qcom-stats.yaml | 5 + + .../{arm => soc}/samsung/exynos-chipid.yaml | 2 +- + .../pmu.yaml => soc/samsung/exynos-pmu.yaml} | 4 +- + .../bindings/soc/samsung/exynos-usi.yaml | 159 + + Documentation/devicetree/bindings/sram/sram.yaml | 3 + + .../thermal/nvidia,tegra186-bpmp-thermal.txt | 33 - + .../thermal/nvidia,tegra186-bpmp-thermal.yaml | 42 + + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 13 + + .../devicetree/bindings/vendor-prefixes.yaml | 8 + + .../devicetree/bindings/watchdog/apple,wdt.yaml | 52 + + Documentation/staging/tee.rst | 30 + + MAINTAINERS | 29 + + arch/arm/Kconfig | 1 - + arch/arm/Kconfig.debug | 14 +- + arch/arm/arm-soc-for-next-contents.txt | 165 + + arch/arm/boot/dts/Makefile | 39 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 1 + + arch/arm/boot/dts/am335x-boneblack-common.dtsi | 4 - + arch/arm/boot/dts/am335x-boneblue.dts | 2 +- + arch/arm/boot/dts/am335x-icev2.dts | 4 + + arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 2 +- + arch/arm/boot/dts/am437x-cm-t43.dts | 2 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 8 + + arch/arm/boot/dts/am437x-l4.dtsi | 31 +- + arch/arm/boot/dts/am43xx-clocks.dtsi | 7 + + arch/arm/boot/dts/armada-38x.dtsi | 4 +- + arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 267 + + arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 12 + + .../arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 756 ++ + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 17 +- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 11 + + arch/arm/boot/dts/aspeed-bmc-tyan-s7106.dts | 40 + + arch/arm/boot/dts/aspeed-bmc-tyan-s8036.dts | 470 + + arch/arm/boot/dts/aspeed-bmc-vegman-n110.dts | 149 + + arch/arm/boot/dts/aspeed-bmc-vegman-rx20.dts | 255 + + arch/arm/boot/dts/aspeed-bmc-vegman-sx20.dts | 154 + + arch/arm/boot/dts/aspeed-bmc-vegman.dtsi | 311 + + arch/arm/boot/dts/aspeed-g4.dtsi | 1 + + arch/arm/boot/dts/aspeed-g5.dtsi | 5 + + arch/arm/boot/dts/aspeed-g6.dtsi | 10 + + arch/arm/boot/dts/at91-q5xr5.dts | 18 - + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 5 +- + arch/arm/boot/dts/at91-sama5d3_ksz9477_evb.dts | 209 + + arch/arm/boot/dts/at91-sama7g5ek.dts | 73 + + arch/arm/boot/dts/at91-wb50n.dts | 6 - + arch/arm/boot/dts/bcm-cygnus.dtsi | 18 +- + arch/arm/boot/dts/bcm-hr2.dtsi | 4 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 8 +- + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 28 +- + arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 3 +- + arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 62 +- + arch/arm/boot/dts/bcm5301x.dtsi | 31 +- + arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi | 4 + + arch/arm/boot/dts/elpida_ecb240abacn.dtsi | 2 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 7 +- + arch/arm/boot/dts/exynos5260.dtsi | 8 +- + arch/arm/boot/dts/gemini-nas4220b.dts | 2 +- + arch/arm/boot/dts/imx1-pinfunc.h | 6 +- + arch/arm/boot/dts/imx1.dtsi | 2 +- + arch/arm/boot/dts/imx25.dtsi | 4 +- + arch/arm/boot/dts/imx27-pinfunc.h | 6 +- + arch/arm/boot/dts/imx28-tx28.dts | 36 - + arch/arm/boot/dts/imx31.dtsi | 2 +- + arch/arm/boot/dts/imx50.dtsi | 10 +- + arch/arm/boot/dts/imx51.dtsi | 10 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 11 - + arch/arm/boot/dts/imx53.dtsi | 10 +- + arch/arm/boot/dts/imx6dl-mba6.dtsi | 22 + + arch/arm/boot/dts/imx6dl-mba6a.dts | 21 + + arch/arm/boot/dts/imx6dl-mba6b.dts | 21 + + arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts | 3 + + arch/arm/boot/dts/imx6q-mba6.dtsi | 44 + + arch/arm/boot/dts/imx6q-mba6a.dts | 20 + + arch/arm/boot/dts/imx6q-mba6b.dts | 20 + + arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts | 3 + + arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts | 3 + + arch/arm/boot/dts/imx6q-yapp4-crux.dts | 54 + + arch/arm/boot/dts/imx6qdl-dhcom-drc02.dtsi | 4 + + arch/arm/boot/dts/imx6qdl-dhcom-pdk2.dtsi | 4 + + arch/arm/boot/dts/imx6qdl-dhcom-som.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-mba6.dtsi | 526 + + arch/arm/boot/dts/imx6qdl-mba6a.dtsi | 36 + + arch/arm/boot/dts/imx6qdl-mba6b.dtsi | 52 + + .../boot/dts/imx6qdl-phytec-mira-peb-av-02.dtsi | 119 + + .../boot/dts/imx6qdl-phytec-mira-peb-eval-01.dtsi | 71 + + .../boot/dts/imx6qdl-phytec-mira-peb-wlbt-05.dtsi | 85 + + arch/arm/boot/dts/imx6qdl-tqma6a.dtsi | 20 + + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 12 - + arch/arm/boot/dts/imx6qdl.dtsi | 8 +- + arch/arm/boot/dts/imx6qp-mba6b.dts | 18 + + arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts | 3 + + arch/arm/boot/dts/imx6qp-yapp4-crux-plus.dts | 54 + + arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi | 12 - + .../boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts | 1 + + .../boot/dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi | 90 + + arch/arm/boot/dts/imx6ul-prti6g.dts | 6 - + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 24 - + arch/arm/boot/dts/imx6ull-jozacp.dts | 456 + + .../boot/dts/imx6ull-phytec-segin-ff-rdk-nand.dts | 1 + + .../boot/dts/imx6ull-phytec-segin-lc-rdk-nand.dts | 1 + + .../boot/dts/imx6ull-phytec-segin-peb-wlbt-05.dtsi | 19 + + arch/arm/boot/dts/imx6ulz-bsh-smm-m2.dts | 146 + + arch/arm/boot/dts/imx7d-remarkable2.dts | 59 + + arch/arm/boot/dts/imx7s-warp.dts | 14 +- + arch/arm/boot/dts/imx7s.dtsi | 22 +- + arch/arm/boot/dts/intel-ixp42x-freecom-fsg-3.dts | 59 + + arch/arm/boot/dts/intel-ixp42x-gateway-7001.dts | 111 + + .../arm/boot/dts/intel-ixp42x-goramo-multilink.dts | 180 + + arch/arm/boot/dts/intel-ixp4xx.dtsi | 17 + + arch/arm/boot/dts/milbeaut-m10v.dtsi | 9 + + arch/arm/boot/dts/motorola-mapphone-common.dtsi | 2 +- + arch/arm/boot/dts/mt6589-fairphone-fp1.dts | 30 + + arch/arm/boot/dts/mt6589.dtsi | 2 +- + arch/arm/boot/dts/omap3-tao3530.dtsi | 14 - + arch/arm/boot/dts/openbmc-flash-layout-64-alt.dtsi | 35 + + arch/arm/boot/dts/qcom-apq8016-sbc.dts | 2 + + .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 1 - + arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 +- + .../boot/dts/qcom-mdm9615-wp8548-mangoh-green.dts | 2 +- + arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 1 - + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 1 - + arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 1 - + .../boot/dts/qcom-msm8974-sony-xperia-amami.dts | 1 - + .../boot/dts/qcom-msm8974-sony-xperia-castor.dts | 1 - + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 1 - + arch/arm/boot/dts/qcom-sdx55-t55.dts | 6 + + arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 59 + + arch/arm/boot/dts/qcom-sdx55.dtsi | 80 + + arch/arm/boot/dts/qcom-sdx65-mtp.dts | 25 + + arch/arm/boot/dts/qcom-sdx65.dtsi | 222 + + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 16 + + .../dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi | 3 + + arch/arm/boot/dts/sama5d2.dtsi | 2 + + arch/arm/boot/dts/sama7g5-pinfunc.h | 2 +- + arch/arm/boot/dts/sama7g5.dtsi | 30 + + arch/arm/boot/dts/spear1310-evb.dts | 16 - + arch/arm/boot/dts/spear1340-evb.dts | 16 - + arch/arm/boot/dts/spear310.dtsi | 1 + + arch/arm/boot/dts/spear320.dtsi | 1 + + arch/arm/boot/dts/spear320s.dtsi | 24 + + arch/arm/boot/dts/ste-dbx5x0.dtsi | 26 + + arch/arm/boot/dts/ste-ux500-samsung-gavini.dts | 39 +- + arch/arm/boot/dts/stm32f429-disco.dts | 2 +- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 32 +- + .../stm32mp157a-icore-stm32mp1-ctouch2-of10.dts | 132 + + .../dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts | 85 + + arch/arm/boot/dts/stm32mp157c-ev1.dts | 22 + + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 16 + + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 3 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 34 +- + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 1 + + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 3 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 3 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 4 + + arch/arm/boot/dts/sun8i-r40.dtsi | 4 +- + arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 3 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 15 +- + arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi | 1 + + arch/arm/boot/dts/tegra114-asus-tf701t.dts | 807 ++ + arch/arm/boot/dts/tegra114-dalmore.dts | 21 +- + arch/arm/boot/dts/tegra114-roth.dts | 16 +- + arch/arm/boot/dts/tegra114-tn7.dts | 10 +- + arch/arm/boot/dts/tegra114.dtsi | 58 +- + arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 436 +- + arch/arm/boot/dts/tegra124-apalis-eval.dts | 2 +- + arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 2 +- + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 16 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 16 +- + arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi | 2606 ++--- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 39 +- + arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 11318 ++++++++++--------- + arch/arm/boot/dts/tegra124-nyan-big-fhd.dts | 11 + + arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi | 758 +- + arch/arm/boot/dts/tegra124-nyan.dtsi | 86 +- + arch/arm/boot/dts/tegra124-peripherals-opp.dtsi | 140 +- + arch/arm/boot/dts/tegra124-venice2.dts | 35 +- + arch/arm/boot/dts/tegra124.dtsi | 45 +- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 27 +- + arch/arm/boot/dts/tegra20-asus-tf101.dts | 1280 +++ + arch/arm/boot/dts/tegra20-colibri-eval-v3.dts | 4 +- + arch/arm/boot/dts/tegra20-colibri-iris.dts | 4 +- + arch/arm/boot/dts/tegra20-colibri.dtsi | 18 +- + arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi | 82 +- + arch/arm/boot/dts/tegra20-cpu-opp.dtsi | 82 +- + arch/arm/boot/dts/tegra20-harmony.dts | 21 +- + arch/arm/boot/dts/tegra20-medcom-wide.dts | 11 +- + arch/arm/boot/dts/tegra20-paz00.dts | 22 +- + arch/arm/boot/dts/tegra20-peripherals-opp.dtsi | 948 +- + arch/arm/boot/dts/tegra20-plutux.dts | 8 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 23 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 7 +- + arch/arm/boot/dts/tegra20-tec.dts | 8 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 26 +- + arch/arm/boot/dts/tegra20-ventana.dts | 15 +- + arch/arm/boot/dts/tegra20.dtsi | 162 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 2 +- + arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts | 2 +- + arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 6 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 6 +- + arch/arm/boot/dts/tegra30-asus-lvds-display.dtsi | 61 + + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 67 +- + .../tegra30-asus-nexus7-grouper-maxim-pmic.dtsi | 4 +- + ...tegra30-asus-nexus7-grouper-memory-timings.dtsi | 12 +- + .../dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi | 2 +- + arch/arm/boot/dts/tegra30-asus-nexus7-grouper.dtsi | 1 - + arch/arm/boot/dts/tegra30-asus-nexus7-tilapia.dtsi | 2 - + arch/arm/boot/dts/tegra30-asus-tf201.dts | 627 + + arch/arm/boot/dts/tegra30-asus-tf300t.dts | 1034 ++ + arch/arm/boot/dts/tegra30-asus-tf300tg.dts | 1087 ++ + arch/arm/boot/dts/tegra30-asus-tf700t.dts | 823 ++ + .../boot/dts/tegra30-asus-transformer-common.dtsi | 1787 +++ + arch/arm/boot/dts/tegra30-beaver.dts | 24 +- + arch/arm/boot/dts/tegra30-cardhu-a02.dts | 12 +- + arch/arm/boot/dts/tegra30-cardhu-a04.dts | 14 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 35 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 25 +- + arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi | 144 +- + arch/arm/boot/dts/tegra30-cpu-opp.dtsi | 144 +- + arch/arm/boot/dts/tegra30-ouya.dts | 8921 ++++++++------- + arch/arm/boot/dts/tegra30-pegatron-chagall.dts | 2859 +++++ + arch/arm/boot/dts/tegra30-peripherals-opp.dtsi | 1370 ++- + arch/arm/boot/dts/tegra30.dtsi | 189 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 6 +- + arch/arm/configs/at91_dt_defconfig | 9 +- + arch/arm/configs/gemini_defconfig | 3 +- + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 68 +- + arch/arm/configs/sama5_defconfig | 8 + + arch/arm/configs/sama7_defconfig | 5 +- + arch/arm/configs/tegra_defconfig | 13 + + arch/arm/include/debug/imx-uart.h | 18 +- + arch/arm/mach-at91/pm.c | 2 + + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-imx/Kconfig | 12 - + arch/arm/mach-imx/Makefile | 2 - + arch/arm/mach-ixp4xx/Kconfig | 13 - + arch/arm/mach-s3c/Kconfig.s3c64xx | 1 - + arch/arm/mach-s3c/gpio-samsung.c | 1 + + arch/arm/mach-s3c/mach-jive.c | 1 + + arch/arm/mach-s5pv210/Kconfig | 1 - + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 5 +- + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 1 + + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 2 + + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 1 + + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 1 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 14 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 4 + + .../dts/allwinner/sun50i-h6-tanix-tx6-mini.dts | 15 + + .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 138 +- + arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi | 189 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 9 + + .../dts/altera/socfpga_stratix10_socdk_nand.dts | 24 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 112 +- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 10 +- + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 83 + + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 14 + + arch/arm64/boot/dts/apple/Makefile | 4 + + arch/arm64/boot/dts/apple/t8103-j274.dts | 33 +- + arch/arm64/boot/dts/apple/t8103-j293.dts | 41 + + arch/arm64/boot/dts/apple/t8103-j313.dts | 33 + + arch/arm64/boot/dts/apple/t8103-j456.dts | 59 + + arch/arm64/boot/dts/apple/t8103-j457.dts | 47 + + arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 78 + + arch/arm64/boot/dts/apple/t8103-pmgr.dtsi | 1138 ++ + arch/arm64/boot/dts/apple/t8103.dtsi | 187 +- + arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 1 + + .../broadcom/bcm4908/bcm4908-netgear-raxe500.dts | 50 + + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 24 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 24 +- + arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts | 4 + + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 36 +- + arch/arm64/boot/dts/freescale/Makefile | 22 + + .../boot/dts/freescale/fsl-ls1028a-qds-13bb.dts | 113 + + .../boot/dts/freescale/fsl-ls1028a-qds-65bb.dts | 108 + + .../boot/dts/freescale/fsl-ls1028a-qds-7777.dts | 82 + + .../boot/dts/freescale/fsl-ls1028a-qds-85bb.dts | 107 + + .../boot/dts/freescale/fsl-ls1028a-qds-899b.dts | 75 + + .../boot/dts/freescale/fsl-ls1028a-qds-9999.dts | 79 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 39 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 103 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 130 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 2 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 13 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 149 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 21 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 10 + + arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts | 21 + + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 93 + + .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 1 - + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 7 + + .../dts/freescale/imx8mm-icore-mx8mm-ctouch2.dts | 1 - + .../dts/freescale/imx8mm-icore-mx8mm-edimm2.2.dts | 1 - + .../boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts | 253 + + .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 335 + + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 86 +- + .../dts/freescale/imx8mn-beacon-baseboard.dtsi | 1 - + .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 1 - + .../dts/freescale/imx8mn-bsh-smm-s2-common.dtsi | 426 + + .../arm64/boot/dts/freescale/imx8mn-bsh-smm-s2.dts | 48 + + .../boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts | 80 + + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 9 + + .../boot/dts/freescale/imx8mn-tqma8mqnl-mba8mx.dts | 237 + + .../arm64/boot/dts/freescale/imx8mn-tqma8mqnl.dtsi | 322 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 29 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 73 + + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 35 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 9 + + .../arm64/boot/dts/freescale/imx8mq-librem5-r3.dts | 25 +- + .../boot/dts/freescale/imx8mq-librem5-r3.dtsi | 45 + + .../arm64/boot/dts/freescale/imx8mq-librem5-r4.dts | 16 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 97 +- + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 1 + + .../boot/dts/freescale/imx8mq-nitrogen-som.dtsi | 15 +- + .../boot/dts/freescale/imx8mq-tqma8mq-mba8mx.dts | 349 + + arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | 360 + + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 115 +- + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 38 + + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 28 + + arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 64 + + arch/arm64/boot/dts/freescale/imx8ulp-pinfunc.h | 978 ++ + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 434 + + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 282 + + .../boot/dts/intel/socfpga_agilex_socdk_nand.dts | 20 +- + arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts | 71 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 + + arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 140 + + arch/arm64/boot/dts/marvell/cn9130.dtsi | 15 + + arch/arm64/boot/dts/mediatek/Makefile | 6 + + arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 57 + + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 169 + + arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 29 + + arch/arm64/boot/dts/mediatek/mt7986b.dtsi | 12 + + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 10 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 + + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 8 + + .../dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts | 36 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts | 33 + + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi | 1 - + .../mt8183-kukui-jacuzzi-fennel14-sku2.dts | 17 + + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts | 1 + + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 1 - + .../dts/mediatek/mt8183-kukui-kakadu-sku22.dts | 19 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 124 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 64 + + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 20 +- + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 27 +- + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 36 +- + .../boot/dts/nvidia/tegra132-peripherals-opp.dtsi | 426 + + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 48 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 20 +- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 20 +- + .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 32 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 95 +- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 12 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 8 +- + .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 20 +- + .../arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 231 +- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 4 +- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 3 - + arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 37 +- + arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 40 +- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 53 +- + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 22 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 27 +- + .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi | 24 + + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 24 + + .../arm64/boot/dts/nvidia/tegra234-p3737-0000.dtsi | 5 + + arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts | 1 - + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 541 +- + arch/arm64/boot/dts/qcom/Makefile | 19 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 10 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 12 + + arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts | 209 + + .../boot/dts/qcom/msm8916-samsung-serranove.dts | 1 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 9 +- + arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 1 - + .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 1 - + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 3 +- + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 30 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 4 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 28 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 - + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 3 - + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 1 + + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 2 - + arch/arm64/boot/dts/qcom/msm8998.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm660.dtsi | 12 +- + arch/arm64/boot/dts/qcom/pm8998.dtsi | 10 + + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 7 +- + .../boot/dts/qcom/sc7180-trogdor-homestar-r2.dts | 2 + + .../boot/dts/qcom/sc7180-trogdor-homestar-r3.dts | 6 +- + .../boot/dts/qcom/sc7180-trogdor-homestar-r4.dts | 21 + + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 3 - + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts | 2 +- + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts | 31 + + ...s => sc7180-trogdor-lazor-limozeen-nots-r9.dts} | 8 +- + .../dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts | 46 + + ...en.dts => sc7180-trogdor-lazor-limozeen-r9.dts} | 6 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 2 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 2 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 9 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 9 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 8 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 22 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 30 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 18 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 3 - + .../dts/qcom/sc7180-trogdor-parade-ps8640.dtsi | 2 + + .../boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 3 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 4 + + arch/arm64/boot/dts/qcom/sc7180.dtsi | 1 - + arch/arm64/boot/dts/qcom/sc7280-crd.dts | 93 + + arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi | 105 + + arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 1 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 89 +- + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 17 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 6 +- + .../dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts | 1 + + .../arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts | 351 + + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 140 + + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 + + .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 2 + + arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 2 + + .../dts/qcom/sdm845-sony-xperia-tama-akari.dts | 13 + + .../dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts | 29 + + .../dts/qcom/sdm845-sony-xperia-tama-apollo.dts | 13 + + .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 438 + + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 1 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 3 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 30 + + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 1 - + arch/arm64/boot/dts/qcom/sm6125.dtsi | 55 + + arch/arm64/boot/dts/qcom/sm6350.dtsi | 299 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 32 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 1 - + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 191 + + arch/arm64/boot/dts/qcom/sm8250.dtsi | 472 +- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 1 - + .../dts/qcom/sm8350-microsoft-surface-duo2.dts | 369 + + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 10 +- + .../dts/qcom/sm8350-sony-xperia-sagami-pdx214.dts | 19 + + .../dts/qcom/sm8350-sony-xperia-sagami-pdx215.dts | 13 + + .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 259 + + arch/arm64/boot/dts/qcom/sm8350.dtsi | 756 +- + arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 398 + + arch/arm64/boot/dts/qcom/sm8450.dtsi | 1115 ++ + arch/arm64/boot/dts/renesas/Makefile | 2 + + arch/arm64/boot/dts/renesas/cat875.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 22 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 20 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 22 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 22 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 22 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 22 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 20 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 7 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 3 +- + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 79 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 105 +- + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 36 + + arch/arm64/boot/dts/renesas/r8a779f0-spider.dts | 22 + + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 121 + + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 382 +- + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 76 + + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 42 + + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 5 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 5 +- + arch/arm64/boot/dts/rockchip/px30.dtsi | 2 +- + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 87 + + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 12 +- + .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 11 + + .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 18 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 7 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 18 +- + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 5 + + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 96 +- + arch/arm64/boot/dts/ti/Makefile | 2 + + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 36 + + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 40 + + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 8 + + arch/arm64/boot/dts/ti/k3-am642.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 20 + + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 30 + + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 8 + + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 6 +- + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 155 + + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 198 +- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 28 + + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 6 +- + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 421 + + arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 937 ++ + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 302 + + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 175 + + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 189 + + arch/arm64/configs/defconfig | 23 + + arch/riscv/Kconfig.socs | 8 + + arch/riscv/boot/dts/Makefile | 1 + + arch/riscv/boot/dts/starfive/Makefile | 2 + + .../boot/dts/starfive/jh7100-beaglev-starlight.dts | 164 + + arch/riscv/boot/dts/starfive/jh7100.dtsi | 230 + + drivers/bus/imx-weim.c | 18 +- + drivers/bus/tegra-gmi.c | 50 +- + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 1 + + drivers/clk/starfive/Kconfig | 9 + + drivers/clk/starfive/Makefile | 3 + + drivers/clk/starfive/clk-starfive-jh7100.c | 689 ++ + drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 2 - + drivers/clk/sunxi-ng/ccu-sun8i-h3.h | 2 - + drivers/firmware/ti_sci.c | 2 +- + drivers/firmware/xilinx/zynqmp.c | 5 +- + drivers/i2c/busses/Kconfig | 10 +- + drivers/memory/renesas-rpc-if.c | 109 +- + drivers/mmc/host/sdhci-tegra.c | 81 +- + drivers/mtd/hyperbus/rpc-if.c | 4 +- + drivers/mtd/nand/raw/tegra_nand.c | 58 +- + drivers/pinctrl/Kconfig | 17 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-starfive.c | 1354 +++ + drivers/pwm/pwm-tegra.c | 82 +- + drivers/reset/Kconfig | 7 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-starfive-jh7100.c | 173 + + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/apple/Kconfig | 22 + + drivers/soc/apple/Makefile | 2 + + drivers/soc/apple/apple-pmgr-pwrstate.c | 324 + + drivers/soc/bcm/brcmstb/pm/pm-mips.c | 5 +- + drivers/soc/imx/gpcv2.c | 29 +- + drivers/soc/imx/imx8m-blk-ctrl.c | 77 +- + drivers/soc/qcom/cpr.c | 2 +- + drivers/soc/qcom/llcc-qcom.c | 28 + + drivers/soc/qcom/qcom_aoss.c | 2 +- + drivers/soc/qcom/qcom_stats.c | 13 + + drivers/soc/qcom/qmi_interface.c | 2 +- + drivers/soc/qcom/rpmh-rsc.c | 2 +- + drivers/soc/qcom/rpmhpd.c | 326 +- + drivers/soc/qcom/rpmpd.c | 42 +- + drivers/soc/qcom/smem.c | 2 +- + drivers/soc/qcom/socinfo.c | 3 + + drivers/soc/renesas/Kconfig | 15 + + drivers/soc/renesas/Makefile | 2 + + drivers/soc/renesas/r8a779a0-sysc.c | 380 +- + drivers/soc/renesas/r8a779f0-sysc.c | 47 + + drivers/soc/renesas/rcar-gen4-sysc.c | 376 + + drivers/soc/renesas/rcar-gen4-sysc.h | 43 + + drivers/soc/renesas/rcar-rst.c | 50 +- + drivers/soc/renesas/renesas-soc.c | 127 +- + drivers/soc/samsung/Kconfig | 14 + + drivers/soc/samsung/Makefile | 2 + + drivers/soc/samsung/exynos-chipid.c | 3 + + drivers/soc/samsung/exynos-pmu.c | 2 + + drivers/soc/samsung/exynos-usi.c | 285 + + drivers/soc/tegra/common.c | 29 +- + drivers/soc/tegra/fuse/fuse-tegra.c | 51 +- + drivers/soc/tegra/fuse/fuse-tegra20.c | 33 +- + drivers/soc/tegra/fuse/fuse.h | 1 + + drivers/soc/tegra/pmc.c | 41 +- + drivers/soc/tegra/regulators-tegra20.c | 99 + + drivers/soc/tegra/regulators-tegra30.c | 122 + + drivers/soc/ti/k3-socinfo.c | 3 +- + drivers/soc/ti/knav_dma.c | 20 +- + drivers/soc/ti/pruss.c | 2 +- + drivers/soc/xilinx/zynqmp_pm_domains.c | 91 +- + drivers/soc/xilinx/zynqmp_power.c | 1 - + drivers/spi/spi-rpc-if.c | 4 +- + drivers/spi/spi-tegra20-slink.c | 9 +- + drivers/staging/media/tegra-vde/vde.c | 63 +- + drivers/tee/optee/Makefile | 1 + + drivers/tee/optee/core.c | 2 +- + drivers/tee/optee/ffa_abi.c | 6 +- + drivers/tee/optee/notif.c | 125 + + drivers/tee/optee/optee_msg.h | 9 + + drivers/tee/optee/optee_private.h | 28 +- + drivers/tee/optee/optee_rpc_cmd.h | 31 +- + drivers/tee/optee/optee_smc.h | 75 +- + drivers/tee/optee/rpc.c | 71 +- + drivers/tee/optee/smc_abi.c | 237 +- + drivers/tee/tee_core.c | 10 +- + drivers/tty/serial/8250/8250_dw.c | 3 + + drivers/usb/chipidea/ci_hdrc_tegra.c | 53 +- + include/dt-bindings/clock/qcom,gcc-sdx65.h | 122 + + include/dt-bindings/clock/qcom,gcc-sm8450.h | 244 + + include/dt-bindings/clock/r8a779f0-cpg-mssr.h | 64 + + include/dt-bindings/clock/starfive-jh7100.h | 202 + + include/dt-bindings/clock/sun50i-a64-ccu.h | 2 +- + include/dt-bindings/clock/sun8i-h3-ccu.h | 2 +- + include/dt-bindings/clock/tegra234-clock.h | 26 +- + include/dt-bindings/memory/tegra234-mc.h | 32 + + include/dt-bindings/pinctrl/k3.h | 3 + + include/dt-bindings/pinctrl/pinctrl-starfive.h | 275 + + include/dt-bindings/pinctrl/samsung.h | 13 +- + include/dt-bindings/power/imx8mn-power.h | 5 + + include/dt-bindings/power/imx8ulp-power.h | 26 + + include/dt-bindings/power/qcom-rpmpd.h | 33 + + include/dt-bindings/power/r8a779f0-sysc.h | 30 + + include/dt-bindings/reset/starfive-jh7100.h | 126 + + include/dt-bindings/reset/tegra234-reset.h | 12 +- + include/dt-bindings/soc/samsung,exynos-usi.h | 17 + + include/linux/platform_data/pata_ixp4xx_cf.h | 21 - + include/linux/soc/qcom/llcc-qcom.h | 3 + + include/linux/soc/renesas/rcar-rst.h | 2 + + include/linux/tee_drv.h | 14 + + include/memory/renesas-rpc-if.h | 8 +- + include/soc/tegra/common.h | 15 + + 692 files changed, 62458 insertions(+), 15844 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/apple/apple,pmgr.yaml + create mode 100644 Documentation/devicetree/bindings/arm/aspeed/aspeed,sbc.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt + create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.yaml + create mode 100644 Documentation/devicetree/bindings/bus/fsl,spba-bus.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sdx65.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sm8450.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7100-clkgen.yaml + delete mode 100644 Documentation/devicetree/bindings/firmware/nvidia,tegra186-bpmp.txt + create mode 100644 Documentation/devicetree/bindings/firmware/nvidia,tegra186-bpmp.yaml + delete mode 100644 Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt + create mode 100644 Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.yaml + create mode 100644 Documentation/devicetree/bindings/gpu/host1x/nvidia,tegra210-nvenc.yaml + create mode 100644 Documentation/devicetree/bindings/gpu/host1x/nvidia,tegra210-nvjpg.yaml + delete mode 100644 Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.txt + create mode 100644 Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.yaml + delete mode 100644 Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt + create mode 100644 Documentation/devicetree/bindings/media/nvidia,tegra-vde.yaml + delete mode 100644 Documentation/devicetree/bindings/misc/nvidia,tegra186-misc.txt + create mode 100644 Documentation/devicetree/bindings/misc/nvidia,tegra186-misc.yaml + delete mode 100644 Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.txt + create mode 100644 Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt + create mode 100644 Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/power/apple,pmgr-pwrstate.yaml + create mode 100644 Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/nvidia,tegra194-tcu.txt + create mode 100644 Documentation/devicetree/bindings/serial/nvidia,tegra194-tcu.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt + create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx8mn-disp-blk-ctrl.yaml + rename Documentation/devicetree/bindings/{arm => soc}/samsung/exynos-chipid.yaml (93%) + rename Documentation/devicetree/bindings/{arm/samsung/pmu.yaml => soc/samsung/exynos-pmu.yaml} (95%) + create mode 100644 Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/nvidia,tegra186-bpmp-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/nvidia,tegra186-bpmp-thermal.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/apple,wdt.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-tyan-s8036.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-vegman-n110.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-vegman-rx20.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-vegman-sx20.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-vegman.dtsi + create mode 100644 arch/arm/boot/dts/at91-sama5d3_ksz9477_evb.dts + create mode 100644 arch/arm/boot/dts/imx6dl-mba6.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-mba6a.dts + create mode 100644 arch/arm/boot/dts/imx6dl-mba6b.dts + create mode 100644 arch/arm/boot/dts/imx6q-mba6.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-mba6a.dts + create mode 100644 arch/arm/boot/dts/imx6q-mba6b.dts + create mode 100644 arch/arm/boot/dts/imx6q-yapp4-crux.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-mba6.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-mba6a.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-mba6b.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-phytec-mira-peb-av-02.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-phytec-mira-peb-eval-01.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-phytec-mira-peb-wlbt-05.dtsi + create mode 100644 arch/arm/boot/dts/imx6qp-mba6b.dts + create mode 100644 arch/arm/boot/dts/imx6qp-yapp4-crux-plus.dts + create mode 100644 arch/arm/boot/dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-jozacp.dts + create mode 100644 arch/arm/boot/dts/imx6ull-phytec-segin-peb-wlbt-05.dtsi + create mode 100644 arch/arm/boot/dts/imx6ulz-bsh-smm-m2.dts + create mode 100644 arch/arm/boot/dts/intel-ixp42x-gateway-7001.dts + create mode 100644 arch/arm/boot/dts/intel-ixp42x-goramo-multilink.dts + create mode 100644 arch/arm/boot/dts/mt6589-fairphone-fp1.dts + create mode 100644 arch/arm/boot/dts/openbmc-flash-layout-64-alt.dtsi + create mode 100644 arch/arm/boot/dts/qcom-apq8016-sbc.dts + create mode 100644 arch/arm/boot/dts/qcom-sdx65-mtp.dts + create mode 100644 arch/arm/boot/dts/qcom-sdx65.dtsi + create mode 100644 arch/arm/boot/dts/spear320s.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-ctouch2-of10.dts + create mode 100644 arch/arm/boot/dts/tegra114-asus-tf701t.dts + create mode 100644 arch/arm/boot/dts/tegra124-nyan-big-fhd.dts + create mode 100644 arch/arm/boot/dts/tegra20-asus-tf101.dts + create mode 100644 arch/arm/boot/dts/tegra30-asus-lvds-display.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-asus-tf201.dts + create mode 100644 arch/arm/boot/dts/tegra30-asus-tf300t.dts + create mode 100644 arch/arm/boot/dts/tegra30-asus-tf300tg.dts + create mode 100644 arch/arm/boot/dts/tegra30-asus-tf700t.dts + create mode 100644 arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-pegatron-chagall.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6-mini.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t8103-j293.dts + create mode 100644 arch/arm64/boot/dts/apple/t8103-j313.dts + create mode 100644 arch/arm64/boot/dts/apple/t8103-j456.dts + create mode 100644 arch/arm64/boot/dts/apple/t8103-j457.dts + create mode 100644 arch/arm64/boot/dts/apple/t8103-jxxx.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t8103-pmgr.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-13bb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-7777.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-85bb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-899b.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-9999.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-tqma8mqnl-mba8mx.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-tqma8mqnl.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-tqma8mq-mba8mx.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8ulp-evk.dts + create mode 100755 arch/arm64/boot/dts/freescale/imx8ulp-pinfunc.h + create mode 100644 arch/arm64/boot/dts/freescale/imx8ulp.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/mba8mx.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986b.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14-sku2.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra132-peripherals-opp.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3737-0000.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts + rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-lazor-limozeen-nots.dts => sc7180-trogdor-lazor-limozeen-nots-r9.dts} (60%) + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts + rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-lazor-limozeen.dts => sc7180-trogdor-lazor-limozeen-r9.dts} (82%) + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-crd.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami-pdx214.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami-pdx215.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm8450-qrd.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8450.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779f0-spider.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779f0.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721s2.dtsi + create mode 100644 arch/riscv/boot/dts/starfive/Makefile + create mode 100644 arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts + create mode 100644 arch/riscv/boot/dts/starfive/jh7100.dtsi + create mode 100644 drivers/clk/starfive/Kconfig + create mode 100644 drivers/clk/starfive/Makefile + create mode 100644 drivers/clk/starfive/clk-starfive-jh7100.c + create mode 100644 drivers/pinctrl/pinctrl-starfive.c + create mode 100644 drivers/reset/reset-starfive-jh7100.c + create mode 100644 drivers/soc/apple/Kconfig + create mode 100644 drivers/soc/apple/Makefile + create mode 100644 drivers/soc/apple/apple-pmgr-pwrstate.c + create mode 100644 drivers/soc/renesas/r8a779f0-sysc.c + create mode 100644 drivers/soc/renesas/rcar-gen4-sysc.c + create mode 100644 drivers/soc/renesas/rcar-gen4-sysc.h + create mode 100644 drivers/soc/samsung/exynos-usi.c + create mode 100644 drivers/tee/optee/notif.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-sdx65.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-sm8450.h + create mode 100644 include/dt-bindings/clock/r8a779f0-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/starfive-jh7100.h + create mode 100644 include/dt-bindings/memory/tegra234-mc.h + create mode 100644 include/dt-bindings/pinctrl/pinctrl-starfive.h + create mode 100644 include/dt-bindings/power/imx8ulp-power.h + create mode 100644 include/dt-bindings/power/r8a779f0-sysc.h + create mode 100644 include/dt-bindings/reset/starfive-jh7100.h + create mode 100644 include/dt-bindings/soc/samsung,exynos-usi.h + delete mode 100644 include/linux/platform_data/pata_ixp4xx_cf.h +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (996b0777eaca Merge branch 'v5.17/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (a7e02e92755c Merge branches 'dt-for-v5.17', 'defconfig-for-v5.17' and 'soc-for-v5.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/configs/aspeed_g5_defconfig | 7 ++++ + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 7 ++-- + drivers/soc/aspeed/aspeed-socinfo.c | 73 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 83 insertions(+), 4 deletions(-) +Merging at91/at91-next (9be3df0e718c Merge branch 'at91-defconfig' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../bindings/clock/microchip,lan966x-gck.yaml | 60 +++++ + drivers/clk/Kconfig | 7 + + drivers/clk/Makefile | 1 + + drivers/clk/clk-gate.c | 35 +++ + drivers/clk/clk-lan966x.c | 293 +++++++++++++++++++++ + include/dt-bindings/clock/microchip,lan966x.h | 34 +++ + include/linux/clk-provider.h | 23 ++ + 7 files changed, 453 insertions(+) + create mode 100644 Documentation/devicetree/bindings/clock/microchip,lan966x-gck.yaml + create mode 100644 drivers/clk/clk-lan966x.c + create mode 100644 include/dt-bindings/clock/microchip,lan966x.h +Merging drivers-memory/for-next (ff086e15d838 Merge branch 'for-v5.17/omap-gpmc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Auto-merging drivers/mtd/nand/raw/Kconfig +Removing Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt +Merge made by the 'recursive' strategy. + .../bindings/memory-controllers/fsl/fsl,ifc.yaml | 113 ++++++++++++++++++ + .../bindings/memory-controllers/fsl/ifc.txt | 82 ------------- + .../bindings/memory-controllers/ti,gpmc.yaml | 23 +++- + drivers/memory/brcmstb_dpfe.c | 2 +- + drivers/memory/fsl_ifc.c | 9 ++ + drivers/memory/mtk-smi.c | 3 +- + drivers/memory/omap-gpmc.c | 50 +++++--- + drivers/memory/tegra/Kconfig | 1 + + drivers/memory/tegra/tegra20-emc.c | 2 +- + drivers/memory/tegra/tegra210-emc-core.c | 2 +- + drivers/memory/tegra/tegra30-emc.c | 131 +++++++++++++++++++-- + drivers/mtd/nand/raw/Kconfig | 1 + + drivers/mtd/nand/raw/omap2.c | 5 +- + include/linux/platform_data/mtd-nand-omap2.h | 9 +- + 14 files changed, 313 insertions(+), 120 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ifc.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt +Merging imx-mxs/for-next (b95a3922f285 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Already up to date. +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (ccf7b63aac3e Merge branch 'v5.16-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (d835946fc3d8 Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging omap/for-next (61b6b9cfada4 Merge branch 'omap-for-v5.17/fixes-not-urgent' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/omap/omap.txt | 3 ++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-wega.dtsi | 2 +- + arch/arm/boot/dts/dra7.dtsi | 20 ++++----- + arch/arm/boot/dts/omap3-beagle-ab4.dts | 47 ++++++++++++++++++++++ + arch/arm/boot/dts/omap3-beagle.dts | 33 --------------- + arch/arm/mach-omap2/display.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 4 +- + drivers/clocksource/timer-ti-dm-systimer.c | 2 +- + include/dt-bindings/clock/dra7.h | 14 +++---- + 10 files changed, 74 insertions(+), 54 deletions(-) + create mode 100644 arch/arm/boot/dts/omap3-beagle-ab4.dts +Merging qcom/for-next (7e5fe035d019 Merge branches 'arm64-defconfig-for-5.17', 'arm64-for-5.17', 'clk-for-5.17', 'defconfig-for-5.17' and 'drivers-for-5.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging drivers/clk/qcom/clk-alpha-pll.c +Auto-merging arch/arm/configs/multi_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig +Auto-merging MAINTAINERS +Resolved 'arch/arm/configs/multi_v7_defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c0ed6d32f583] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/qcom.yaml | 6 - + .../bindings/clock/qcom,gcc-msm8976.yaml | 97 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 + + MAINTAINERS | 9 + + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 + + drivers/clk/qcom/Kconfig | 24 + + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/clk-alpha-pll.c | 164 +- + drivers/clk/qcom/clk-alpha-pll.h | 3 + + drivers/clk/qcom/clk-rpmh.c | 52 + + drivers/clk/qcom/clk-smd-rpm.c | 31 +- + drivers/clk/qcom/gcc-msm8976.c | 4155 ++++++++++++++++++++ + drivers/clk/qcom/gcc-msm8994.c | 1 + + drivers/clk/qcom/gcc-sdx65.c | 1611 ++++++++ + drivers/clk/qcom/gcc-sm6350.c | 1 + + drivers/clk/qcom/gcc-sm8350.c | 1 + + drivers/clk/qcom/gcc-sm8450.c | 3304 ++++++++++++++++ + drivers/clk/qcom/lpasscc-sc7280.c | 1 + + drivers/clk/qcom/lpasscc-sdm845.c | 1 + + drivers/clk/qcom/mmcc-apq8084.c | 1 + + drivers/clk/qcom/q6sstop-qcs404.c | 1 + + drivers/clk/qcom/turingcc-qcs404.c | 1 + + include/dt-bindings/clock/qcom,gcc-msm8976.h | 240 ++ + 23 files changed, 9676 insertions(+), 38 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8976.yaml + create mode 100644 drivers/clk/qcom/gcc-msm8976.c + create mode 100644 drivers/clk/qcom/gcc-sdx65.c + create mode 100644 drivers/clk/qcom/gcc-sm8450.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8976.h +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging renesas/next (743002730737 Merge branch 'renesas-arm-dt-for-v5.17' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Already up to date. +Merge made by the 'recursive' strategy. +Merging reset/reset/next (89e7a6698fdd reset: uniphier-glue: Use devm_add_action_or_reset()) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Auto-merging drivers/reset/reset-rzg2l-usbphy-ctrl.c +Merge made by the 'recursive' strategy. + .../bindings/reset/hisilicon,hi3660-reset.yaml | 5 ++ + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 4 +- + drivers/reset/reset-uniphier-glue.c | 75 ++++++++++------------ + include/linux/reset.h | 20 ++++++ + 4 files changed, 62 insertions(+), 42 deletions(-) +Merging rockchip/for-next (2a9ed9fa8fe5 Merge branch 'v5.17-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/soc/rockchip/grf.yaml | 1 + + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 52 ++++++++++++ + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 98 ++++++++++++++++++++++ + 3 files changed, 151 insertions(+) +Merging samsung-krzk/for-next (b1cbda0fc343 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/exynos/Makefile | 1 + + arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 195 ++++++ + arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi | 643 ++++++++++++++++++ + arch/arm64/boot/dts/exynos/exynos850.dtsi | 759 ++++++++++++++++++++++ + 4 files changed, 1598 insertions(+) + create mode 100644 arch/arm64/boot/dts/exynos/exynos850-e850-96.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos850.dtsi +Merging scmi/for-linux-next (a0708ab07633 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/arm,scmi.yaml | 65 +++ + drivers/clk/clk-scmi.c | 54 +- + drivers/firmware/arm_scmi/Kconfig | 56 ++ + drivers/firmware/arm_scmi/Makefile | 1 + + drivers/firmware/arm_scmi/clock.c | 22 +- + drivers/firmware/arm_scmi/common.h | 26 +- + drivers/firmware/arm_scmi/driver.c | 207 ++++++-- + drivers/firmware/arm_scmi/mailbox.c | 3 +- + drivers/firmware/arm_scmi/optee.c | 567 +++++++++++++++++++++ + drivers/firmware/arm_scmi/smc.c | 98 +++- + drivers/firmware/arm_scmi/virtio.c | 320 ++++++++++-- + include/linux/scmi_protocol.h | 11 + + include/trace/events/scmi.h | 28 + + 13 files changed, 1340 insertions(+), 118 deletions(-) + create mode 100644 drivers/firmware/arm_scmi/optee.c +Merging stm32/stm32-next (3ff0810ffc47 ARM: dts: stm32: Add Engicam i.Core STM32MP1 C.TOUCH 2.0 10.1" OF) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (1d21ba6546a5 Merge branch 'sunxi/dt-for-5.17' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Auto-merging drivers/clk/Makefile +Merge made by the 'recursive' strategy. + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 4 + + drivers/clk/Makefile | 2 +- + drivers/clk/sunxi-ng/Kconfig | 49 +- + drivers/clk/sunxi-ng/Makefile | 101 +- + drivers/clk/sunxi-ng/ccu-sun20i-d1-r.c | 140 ++ + drivers/clk/sunxi-ng/ccu-sun20i-d1-r.h | 17 + + drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 1390 ++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun20i-d1.h | 15 + + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 58 +- + drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 56 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 33 +- + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 40 +- + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 35 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 40 +- + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 9 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 62 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 65 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 6 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 57 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 7 +- + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 40 +- + drivers/clk/sunxi-ng/ccu_common.c | 6 + + drivers/clk/sunxi-ng/ccu_div.c | 1 + + drivers/clk/sunxi-ng/ccu_div.h | 78 ++ + drivers/clk/sunxi-ng/ccu_frac.c | 6 + + drivers/clk/sunxi-ng/ccu_gate.c | 4 + + drivers/clk/sunxi-ng/ccu_gate.h | 32 +- + drivers/clk/sunxi-ng/ccu_mp.c | 2 + + drivers/clk/sunxi-ng/ccu_mp.h | 49 + + drivers/clk/sunxi-ng/ccu_mult.c | 1 + + drivers/clk/sunxi-ng/ccu_mux.c | 6 + + drivers/clk/sunxi-ng/ccu_mux.h | 33 + + drivers/clk/sunxi-ng/ccu_nk.c | 1 + + drivers/clk/sunxi-ng/ccu_nkm.c | 1 + + drivers/clk/sunxi-ng/ccu_nkmp.c | 1 + + drivers/clk/sunxi-ng/ccu_nm.c | 1 + + drivers/clk/sunxi-ng/ccu_phase.c | 1 + + drivers/clk/sunxi-ng/ccu_reset.c | 1 + + drivers/clk/sunxi-ng/ccu_sdm.c | 6 + + drivers/mmc/host/Kconfig | 1 + + include/dt-bindings/clock/sun20i-d1-ccu.h | 156 +++ + include/dt-bindings/clock/sun20i-d1-r-ccu.h | 19 + + include/dt-bindings/reset/sun20i-d1-ccu.h | 77 ++ + include/dt-bindings/reset/sun20i-d1-r-ccu.h | 16 + + include/linux/clk/sunxi-ng.h | 15 - + 52 files changed, 2530 insertions(+), 253 deletions(-) + create mode 100644 drivers/clk/sunxi-ng/ccu-sun20i-d1-r.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun20i-d1-r.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun20i-d1.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun20i-d1.h + create mode 100644 include/dt-bindings/clock/sun20i-d1-ccu.h + create mode 100644 include/dt-bindings/clock/sun20i-d1-r-ccu.h + create mode 100644 include/dt-bindings/reset/sun20i-d1-ccu.h + create mode 100644 include/dt-bindings/reset/sun20i-d1-r-ccu.h +Merging tee/next (ce352be35ba0 Merge branch 'async_notif' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Already up to date. +Merge made by the 'recursive' strategy. +Merging tegra/for-next (707b88674206 Merge branch for-5.17/arm/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-device.c | 199 ++++++++++++++++++++++++++++++++++++ + drivers/clk/tegra/clk-pll.c | 2 +- + drivers/clk/tegra/clk-super.c | 2 +- + drivers/clk/tegra/clk-tegra114.c | 2 +- + drivers/clk/tegra/clk-tegra20.c | 77 ++++++++++---- + drivers/clk/tegra/clk-tegra30.c | 116 +++++++++++++++------ + drivers/clk/tegra/clk.c | 75 +++++++++++++- + drivers/clk/tegra/clk.h | 2 + + drivers/memory/tegra/Makefile | 1 + + drivers/memory/tegra/mc.c | 3 + + drivers/memory/tegra/mc.h | 7 +- + drivers/memory/tegra/tegra186-emc.c | 3 + + drivers/memory/tegra/tegra234.c | 81 +++++++++++++++ + 14 files changed, 515 insertions(+), 56 deletions(-) + create mode 100644 drivers/clk/tegra/clk-device.c + create mode 100644 drivers/memory/tegra/tegra234.c +Merging ti/ti-next (e66d73b2aa76 Merge branch 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 14 ++++++++++++-- + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 22 ---------------------- + arch/arm64/configs/defconfig | 7 +++++++ + 3 files changed, 19 insertions(+), 24 deletions(-) +Merging xilinx/for-next (2eb48e610ef7 Merge remote-tracking branch 'zynqmp/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 28 ---------------------------- + 1 file changed, 28 deletions(-) +Merging clk/clk-next (79ace752c9ea Merge branch 'clk-cleanup' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Removing drivers/platform/x86/intel/int3472/intel_skl_int3472_common.c +Auto-merging drivers/mmc/host/renesas_sdhi_core.c +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +Auto-merging drivers/acpi/scan.c +Merge made by the 'recursive' strategy. + .../bindings/clock/renesas,cpg-mssr.yaml | 1 + + drivers/acpi/scan.c | 37 ++- + drivers/clk/Kconfig | 8 + + drivers/clk/Makefile | 1 + + drivers/clk/clk-gemini.c | 2 +- + drivers/clk/clk-stm32f4.c | 4 - + drivers/clk/clk-stm32mp1.c | 2 - + drivers/clk/clk-tps68470.c | 261 +++++++++++++++++++++ + drivers/clk/clk.c | 78 +++++- + drivers/clk/imx/clk-pllv1.c | 17 +- + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a774b1-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a774c0-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a774e1-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a77965-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a77980-cpg-mssr.c | 3 +- + drivers/clk/renesas/r8a77990-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a77995-cpg-mssr.c | 3 +- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 17 +- + drivers/clk/renesas/r9a07g044-cpg.c | 62 ++++- + drivers/clk/renesas/rcar-cpg-lib.c | 211 +++-------------- + drivers/clk/renesas/rcar-cpg-lib.h | 7 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 24 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 4 + + drivers/clk/renesas/renesas-cpg-mssr.c | 18 +- + drivers/clk/renesas/rzg2l-cpg.c | 18 +- + drivers/clk/renesas/rzg2l-cpg.h | 5 + + drivers/clk/ti/adpll.c | 2 +- + drivers/clk/zynq/pll.c | 12 +- + drivers/i2c/i2c-core-acpi.c | 22 +- + drivers/mmc/host/renesas_sdhi.h | 4 + + drivers/mmc/host/renesas_sdhi_core.c | 45 +++- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 21 ++ + drivers/platform/x86/intel/int3472/Makefile | 9 +- + ...472_clk_and_regulator.c => clk_and_regulator.c} | 2 +- + drivers/platform/x86/intel/int3472/common.c | 82 +++++++ + .../{intel_skl_int3472_common.h => common.h} | 6 +- + .../{intel_skl_int3472_discrete.c => discrete.c} | 51 ++-- + .../x86/intel/int3472/intel_skl_int3472_common.c | 106 --------- + .../{intel_skl_int3472_tps68470.c => tps68470.c} | 92 +++++++- + drivers/platform/x86/intel/int3472/tps68470.h | 25 ++ + .../x86/intel/int3472/tps68470_board_data.c | 145 ++++++++++++ + include/acpi/acpi_bus.h | 5 +- + include/linux/i2c.h | 17 +- + include/linux/mfd/tps68470.h | 11 + + include/linux/platform_data/tps68470.h | 35 +++ + 48 files changed, 1106 insertions(+), 459 deletions(-) + create mode 100644 drivers/clk/clk-tps68470.c + rename drivers/platform/x86/intel/int3472/{intel_skl_int3472_clk_and_regulator.c => clk_and_regulator.c} (99%) + create mode 100644 drivers/platform/x86/intel/int3472/common.c + rename drivers/platform/x86/intel/int3472/{intel_skl_int3472_common.h => common.h} (94%) + rename drivers/platform/x86/intel/int3472/{intel_skl_int3472_discrete.c => discrete.c} (91%) + delete mode 100644 drivers/platform/x86/intel/int3472/intel_skl_int3472_common.c + rename drivers/platform/x86/intel/int3472/{intel_skl_int3472_tps68470.c => tps68470.c} (56%) + create mode 100644 drivers/platform/x86/intel/int3472/tps68470.h + create mode 100644 drivers/platform/x86/intel/int3472/tps68470_board_data.c + create mode 100644 include/linux/platform_data/tps68470.h +Merging clk-imx/for-next (9dd81021084f clk: imx8mp: Fix the parent clk of the audio_root_clk) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'recursive' strategy. + drivers/clk/imx/clk-imx8mn.c | 6 +++--- + drivers/clk/imx/clk-imx8mp.c | 2 +- + drivers/clk/imx/clk-imx8ulp.c | 1 + + drivers/clk/imx/clk-pllv3.c | 6 +++--- + include/dt-bindings/clock/imx8mp-clock.h | 1 - + 5 files changed, 8 insertions(+), 8 deletions(-) +Merging clk-renesas/renesas-clk (f0b62b0bbedc clk: renesas: r9a07g044: Add GPU clock and reset entries) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'recursive' strategy. + drivers/clk/renesas/Kconfig | 13 +- + drivers/clk/renesas/Makefile | 2 + + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 350 +++----------------------------- + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 183 +++++++++++++++++ + drivers/clk/renesas/r9a07g044-cpg.c | 19 +- + drivers/clk/renesas/rcar-gen4-cpg.c | 305 ++++++++++++++++++++++++++++ + drivers/clk/renesas/rcar-gen4-cpg.h | 76 +++++++ + drivers/clk/renesas/renesas-cpg-mssr.c | 42 ++-- + drivers/clk/renesas/renesas-cpg-mssr.h | 3 +- + drivers/clk/renesas/rzg2l-cpg.h | 4 + + 10 files changed, 654 insertions(+), 343 deletions(-) + create mode 100644 drivers/clk/renesas/r8a779f0-cpg-mssr.c + create mode 100644 drivers/clk/renesas/rcar-gen4-cpg.c + create mode 100644 drivers/clk/renesas/rcar-gen4-cpg.h +Merging clk-samsung/for-next (45bd8166a1d8 clk: samsung: Add initial Exynos7885 clock driver) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/samsung,exynos7885-clock.yaml | 166 ++++++ + .../bindings/clock/samsung,exynos850-clock.yaml | 38 ++ + drivers/clk/samsung/Makefile | 2 + + drivers/clk/samsung/clk-cpu.c | 2 +- + drivers/clk/samsung/clk-cpu.h | 7 - + drivers/clk/samsung/clk-exynos-arm64.c | 94 ++++ + drivers/clk/samsung/clk-exynos-arm64.h | 20 + + drivers/clk/samsung/clk-exynos3250.c | 54 +- + drivers/clk/samsung/clk-exynos4.c | 41 +- + drivers/clk/samsung/clk-exynos5250.c | 21 +- + drivers/clk/samsung/clk-exynos5420.c | 29 +- + drivers/clk/samsung/clk-exynos7885.c | 597 +++++++++++++++++++++ + drivers/clk/samsung/clk-exynos850.c | 366 ++++++++++--- + drivers/clk/samsung/clk-pll.c | 1 + + drivers/clk/samsung/clk-pll.h | 1 + + drivers/clk/samsung/clk-s3c2410.c | 6 +- + drivers/clk/samsung/clk-s3c64xx.c | 8 +- + drivers/clk/samsung/clk-s5pv210.c | 8 +- + drivers/clk/samsung/clk.c | 14 - + drivers/clk/samsung/clk.h | 36 +- + include/dt-bindings/clock/exynos4.h | 4 +- + include/dt-bindings/clock/exynos5250.h | 4 +- + include/dt-bindings/clock/exynos7885.h | 115 ++++ + include/dt-bindings/clock/exynos850.h | 54 +- + 24 files changed, 1503 insertions(+), 185 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos7885-clock.yaml + create mode 100644 drivers/clk/samsung/clk-exynos-arm64.c + create mode 100644 drivers/clk/samsung/clk-exynos-arm64.h + create mode 100644 drivers/clk/samsung/clk-exynos7885.c + create mode 100644 include/dt-bindings/clock/exynos7885.h +Merging csky/linux-next (a0793fdad9a1 csky: fix typo of fpu config macro) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs) +$ git merge -m Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git h8300/h8300-next +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Removing arch/h8300/mm/memory.c +Auto-merging arch/h8300/mm/init.c +Auto-merging arch/h8300/kernel/setup.c +Removing arch/h8300/include/asm/segment.h +Auto-merging arch/h8300/include/asm/processor.h +Auto-merging arch/h8300/Kconfig.cpu +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 1 - + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/include/asm/processor.h | 1 - + arch/h8300/include/asm/segment.h | 40 -------------------- + arch/h8300/include/asm/thread_info.h | 3 -- + arch/h8300/kernel/entry.S | 1 - + arch/h8300/kernel/head_ram.S | 1 - + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + arch/h8300/mm/Makefile | 2 +- + arch/h8300/mm/init.c | 6 --- + arch/h8300/mm/memory.c | 53 -------------------------- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 24 files changed, 124 insertions(+), 169 deletions(-) + delete mode 100644 arch/h8300/include/asm/segment.h + delete mode 100644 arch/h8300/mm/memory.c +Merging m68k/for-next (1a0ae068bf6b m68k: defconfig: Update defconfigs for v5.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + arch/m68k/Kconfig | 1 + + arch/m68k/configs/amiga_defconfig | 2 -- + arch/m68k/configs/apollo_defconfig | 2 -- + arch/m68k/configs/atari_defconfig | 2 -- + arch/m68k/configs/bvme6000_defconfig | 2 -- + arch/m68k/configs/hp300_defconfig | 2 -- + arch/m68k/configs/mac_defconfig | 2 -- + arch/m68k/configs/multi_defconfig | 2 -- + arch/m68k/configs/mvme147_defconfig | 2 -- + arch/m68k/configs/mvme16x_defconfig | 2 -- + arch/m68k/configs/q40_defconfig | 2 -- + arch/m68k/configs/sun3_defconfig | 2 -- + arch/m68k/configs/sun3x_defconfig | 2 -- + arch/m68k/kernel/setup_mm.c | 15 ++++++--------- + arch/m68k/mm/motorola.c | 2 ++ + 16 files changed, 10 insertions(+), 34 deletions(-) +Merging m68knommu/for-next (a7904a538933 Linux 5.16-rc6) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (7b94b7f0ae24 microblaze: add const to of_device_id) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/kernel/signal.c | 2 +- + arch/microblaze/pci/xilinx_pci.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mips/mips-next (79876cc1d7b8 MIPS: new Kconfig option ZBOOT_LOAD_ADDRESS) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Auto-merging drivers/mtd/nand/raw/Kconfig +Removing drivers/mtd/maps/rbtx4939-flash.c +Removing drivers/char/hw_random/tx4939-rng.c +Removing arch/mips/txx9/rbtx4939/setup.c +Removing arch/mips/txx9/rbtx4939/prom.c +Removing arch/mips/txx9/rbtx4939/irq.c +Removing arch/mips/txx9/rbtx4939/Makefile +Removing arch/mips/txx9/rbtx4938/setup.c +Removing arch/mips/txx9/rbtx4938/prom.c +Removing arch/mips/txx9/rbtx4938/irq.c +Removing arch/mips/txx9/rbtx4938/Makefile +Removing arch/mips/txx9/generic/spi_eeprom.c +Removing arch/mips/txx9/generic/setup_tx4939.c +Removing arch/mips/txx9/generic/irq_tx4939.c +Removing arch/mips/txx9/generic/7segled.c +Removing arch/mips/pci/pci-tx4939.c +Removing arch/mips/pci/fixup-rbtx4938.c +Removing arch/mips/include/asm/txx9/tx4939.h +Removing arch/mips/include/asm/txx9/spi.h +Removing arch/mips/include/asm/txx9/rbtx4939.h +Removing arch/mips/include/asm/txx9/rbtx4938.h +Merge made by the 'recursive' strategy. + .../bindings/mips/loongson/ls2k-reset.yaml | 38 ++ + arch/mips/Kconfig | 21 +- + arch/mips/Makefile | 2 - + arch/mips/alchemy/common/gpiolib.c | 2 - + arch/mips/bcm47xx/Platform | 1 - + arch/mips/bcm47xx/board.c | 2 +- + arch/mips/bcm63xx/clk.c | 6 + + arch/mips/boot/compressed/Makefile | 4 + + arch/mips/boot/dts/ingenic/ci20.dts | 72 ++- + arch/mips/boot/dts/ingenic/jz4725b.dtsi | 2 +- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +- + arch/mips/boot/dts/ingenic/jz4770.dtsi | 2 +- + arch/mips/boot/dts/ingenic/jz4780.dtsi | 40 ++ + arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 5 + + arch/mips/cavium-octeon/octeon-platform.c | 2 + + arch/mips/cavium-octeon/octeon-usb.c | 1 + + arch/mips/configs/ci20_defconfig | 6 + + arch/mips/configs/rbtx49xx_defconfig | 4 - + arch/mips/dec/prom/init.c | 2 +- + arch/mips/generic/Platform | 3 +- + arch/mips/generic/init.c | 11 +- + arch/mips/include/asm/kgdb.h | 2 +- + .../asm/mach-loongson64/kernel-entry-init.h | 4 +- + arch/mips/include/asm/mach-tx49xx/mangle-port.h | 8 - + arch/mips/include/asm/mips-cps.h | 19 +- + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 4 +- + arch/mips/include/asm/sibyte/sb1250_mc.h | 2 +- + arch/mips/include/asm/smp-ops.h | 3 + + arch/mips/include/asm/txx9/boards.h | 6 - + arch/mips/include/asm/txx9/rbtx4938.h | 145 ------ + arch/mips/include/asm/txx9/rbtx4939.h | 142 ------ + arch/mips/include/asm/txx9/spi.h | 34 -- + arch/mips/include/asm/txx9/tx4939.h | 524 ------------------- + arch/mips/kernel/mips-cpc.c | 3 +- + arch/mips/kernel/signal.c | 27 +- + arch/mips/lantiq/clk.c | 6 + + arch/mips/lantiq/falcon/sysctrl.c | 2 +- + arch/mips/loongson2ef/Platform | 19 +- + arch/mips/mm/c-octeon.c | 4 +- + arch/mips/pci/Makefile | 2 - + arch/mips/pci/fixup-rbtx4938.c | 53 -- + arch/mips/pci/pci-tx4939.c | 107 ---- + arch/mips/ralink/ill_acc.c | 1 + + arch/mips/sgi-ip22/Platform | 5 - + arch/mips/txx9/Kconfig | 51 +- + arch/mips/txx9/Makefile | 2 - + arch/mips/txx9/generic/7segled.c | 123 ----- + arch/mips/txx9/generic/Makefile | 3 - + arch/mips/txx9/generic/irq_tx4939.c | 216 -------- + arch/mips/txx9/generic/setup.c | 53 -- + arch/mips/txx9/generic/setup_tx4939.c | 568 --------------------- + arch/mips/txx9/generic/spi_eeprom.c | 104 ---- + arch/mips/txx9/rbtx4938/Makefile | 2 - + arch/mips/txx9/rbtx4938/irq.c | 157 ------ + arch/mips/txx9/rbtx4938/prom.c | 22 - + arch/mips/txx9/rbtx4938/setup.c | 372 -------------- + arch/mips/txx9/rbtx4939/Makefile | 2 - + arch/mips/txx9/rbtx4939/irq.c | 95 ---- + arch/mips/txx9/rbtx4939/prom.c | 29 -- + arch/mips/txx9/rbtx4939/setup.c | 554 -------------------- + drivers/char/hw_random/Kconfig | 13 - + drivers/char/hw_random/Makefile | 1 - + drivers/char/hw_random/tx4939-rng.c | 157 ------ + drivers/mtd/maps/Kconfig | 6 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/rbtx4939-flash.c | 133 ----- + drivers/mtd/nand/raw/Kconfig | 2 +- + drivers/platform/mips/Kconfig | 6 + + drivers/platform/mips/Makefile | 1 + + drivers/platform/mips/ls2k-reset.c | 53 ++ + 70 files changed, 311 insertions(+), 3765 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/loongson/ls2k-reset.yaml + delete mode 100644 arch/mips/include/asm/txx9/rbtx4938.h + delete mode 100644 arch/mips/include/asm/txx9/rbtx4939.h + delete mode 100644 arch/mips/include/asm/txx9/spi.h + delete mode 100644 arch/mips/include/asm/txx9/tx4939.h + delete mode 100644 arch/mips/pci/fixup-rbtx4938.c + delete mode 100644 arch/mips/pci/pci-tx4939.c + delete mode 100644 arch/mips/txx9/generic/7segled.c + delete mode 100644 arch/mips/txx9/generic/irq_tx4939.c + delete mode 100644 arch/mips/txx9/generic/setup_tx4939.c + delete mode 100644 arch/mips/txx9/generic/spi_eeprom.c + delete mode 100644 arch/mips/txx9/rbtx4938/Makefile + delete mode 100644 arch/mips/txx9/rbtx4938/irq.c + delete mode 100644 arch/mips/txx9/rbtx4938/prom.c + delete mode 100644 arch/mips/txx9/rbtx4938/setup.c + delete mode 100644 arch/mips/txx9/rbtx4939/Makefile + delete mode 100644 arch/mips/txx9/rbtx4939/irq.c + delete mode 100644 arch/mips/txx9/rbtx4939/prom.c + delete mode 100644 arch/mips/txx9/rbtx4939/setup.c + delete mode 100644 drivers/char/hw_random/tx4939-rng.c + delete mode 100644 drivers/mtd/maps/rbtx4939-flash.c + create mode 100644 drivers/platform/mips/ls2k-reset.c +Merging nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git nds32/next +Auto-merging arch/nds32/Makefile +Auto-merging arch/nds32/Kconfig +CONFLICT (content): Merge conflict in arch/nds32/Kconfig +Auto-merging arch/nds32/Kbuild +CONFLICT (content): Merge conflict in arch/nds32/Kbuild +Resolved 'arch/nds32/Kbuild' using previous resolution. +Resolved 'arch/nds32/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ffe77f86ff4c] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/nds32/Kbuild | 3 +++ + arch/nds32/Kconfig | 4 +++- + arch/nds32/Makefile | 3 --- + 3 files changed, 6 insertions(+), 4 deletions(-) +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (433fe39f674d openrisc: Add clone3 ABI wrapper) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/include/asm/syscalls.h | 2 ++ + arch/openrisc/kernel/entry.S | 27 +++++++++++++-------------- + 2 files changed, 15 insertions(+), 14 deletions(-) +Merging parisc-hd/for-next (c7a9608cafef parisc: Show registers at KERN_CRIT loglevel in parisc_terminate) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Auto-merging scripts/remove-stale-files +Merge made by the 'recursive' strategy. + arch/parisc/boot/compressed/.gitignore | 2 - + arch/parisc/boot/compressed/Makefile | 8 - + arch/parisc/boot/compressed/firmware.c | 2 + + arch/parisc/boot/compressed/real2.S | 2 + + arch/parisc/include/asm/assembly.h | 10 + + arch/parisc/include/asm/futex.h | 59 ++- + arch/parisc/include/asm/special_insns.h | 44 +- + arch/parisc/include/asm/uaccess.h | 12 +- + arch/parisc/include/uapi/asm/pdc.h | 10 +- + arch/parisc/kernel/asm-offsets.c | 1 + + arch/parisc/kernel/syscall.S | 771 ++++++++++++++++++++++++-------- + arch/parisc/kernel/traps.c | 13 +- + arch/parisc/mm/fault.c | 6 +- + scripts/remove-stale-files | 5 + + 14 files changed, 686 insertions(+), 259 deletions(-) + create mode 100644 arch/parisc/boot/compressed/firmware.c + create mode 100644 arch/parisc/boot/compressed/real2.S +Merging powerpc/next (beeac538c366 selftests/powerpc: Add a test of sigreturning to an unaligned address) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Removing arch/powerpc/platforms/pseries/scanlog.c +Auto-merging arch/powerpc/platforms/85xx/smp.c +Auto-merging arch/powerpc/mm/ptdump/ptdump.c +Removing arch/powerpc/mm/book3s32/kuep.c +Removing arch/powerpc/lib/test_code-patching.S +Auto-merging arch/powerpc/kernel/head_32.h +Auto-merging arch/powerpc/kernel/Makefile +Auto-merging arch/powerpc/configs/pseries_defconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 16 +- + arch/powerpc/Kconfig | 10 +- + arch/powerpc/Makefile | 9 +- + arch/powerpc/boot/crt0.S | 33 +- + arch/powerpc/boot/dts/digsy_mtc.dts | 8 - + arch/powerpc/boot/dts/o2d.dtsi | 6 - + arch/powerpc/boot/zImage.lds.S | 7 +- + arch/powerpc/configs/microwatt_defconfig | 3 +- + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/crypto/md5-asm.S | 10 +- + arch/powerpc/crypto/sha1-powerpc-asm.S | 6 +- + arch/powerpc/include/asm/asm-prototypes.h | 5 - + arch/powerpc/include/asm/atomic.h | 151 +--- + arch/powerpc/include/asm/bitops.h | 89 +- + arch/powerpc/include/asm/book3s/32/kup.h | 108 +-- + arch/powerpc/include/asm/book3s/32/mmu-hash.h | 82 +- + arch/powerpc/include/asm/book3s/64/hash.h | 4 - + arch/powerpc/include/asm/book3s/64/kup.h | 56 +- + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 8 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 38 +- + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 6 + + arch/powerpc/include/asm/book3s/64/tlbflush.h | 4 - + arch/powerpc/include/asm/book3s/pgtable.h | 4 + + arch/powerpc/include/asm/btext.h | 10 +- + arch/powerpc/include/asm/code-patching.h | 40 +- + arch/powerpc/include/asm/cpm2.h | 6 +- + arch/powerpc/include/asm/cpuidle.h | 2 +- + arch/powerpc/include/asm/cputhreads.h | 33 - + arch/powerpc/include/asm/eeh.h | 2 +- + arch/powerpc/include/asm/exception-64e.h | 4 + + arch/powerpc/include/asm/fadump-internal.h | 6 +- + arch/powerpc/include/asm/firmware.h | 8 - + arch/powerpc/include/asm/head-64.h | 12 +- + arch/powerpc/include/asm/hugetlb.h | 2 +- + arch/powerpc/include/asm/hw_breakpoint.h | 5 +- + arch/powerpc/include/asm/hw_irq.h | 107 ++- + arch/powerpc/include/asm/i8259.h | 2 +- + arch/powerpc/include/asm/inst.h | 95 ++- + arch/powerpc/include/asm/interrupt.h | 73 +- + arch/powerpc/include/asm/iommu.h | 2 +- + arch/powerpc/include/asm/ipic.h | 2 +- + arch/powerpc/include/asm/irq.h | 2 +- + arch/powerpc/include/asm/kexec.h | 2 +- + arch/powerpc/include/asm/kup.h | 122 ++- + arch/powerpc/include/asm/kvm_asm.h | 1 + + arch/powerpc/include/asm/kvm_book3s.h | 6 + + arch/powerpc/include/asm/kvm_book3s_64.h | 5 +- + arch/powerpc/include/asm/kvm_guest.h | 2 +- + arch/powerpc/include/asm/kvm_host.h | 7 +- + arch/powerpc/include/asm/kvm_ppc.h | 4 +- + arch/powerpc/include/asm/machdep.h | 2 - + arch/powerpc/include/asm/mmu.h | 16 +- + arch/powerpc/include/asm/mmu_context.h | 4 +- + arch/powerpc/include/asm/mpic.h | 2 +- + arch/powerpc/include/asm/nohash/32/kup-8xx.h | 50 +- + arch/powerpc/include/asm/nohash/32/mmu-44x.h | 1 - + arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 6 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 6 + + arch/powerpc/include/asm/nohash/kup-booke.h | 110 +++ + arch/powerpc/include/asm/opal-api.h | 1 + + arch/powerpc/include/asm/opal.h | 2 +- + arch/powerpc/include/asm/paca.h | 8 + + arch/powerpc/include/asm/pci.h | 2 +- + arch/powerpc/include/asm/perf_event_server.h | 2 +- + arch/powerpc/include/asm/ppc-opcode.h | 6 + + arch/powerpc/include/asm/ppc_asm.h | 43 +- + arch/powerpc/include/asm/processor.h | 18 +- + arch/powerpc/include/asm/ptrace.h | 2 +- + arch/powerpc/include/asm/reg.h | 16 +- + arch/powerpc/include/asm/rtas.h | 2 +- + arch/powerpc/include/asm/sections.h | 16 +- + arch/powerpc/include/asm/setup.h | 9 +- + arch/powerpc/include/asm/smu.h | 2 +- + arch/powerpc/include/asm/sstep.h | 4 +- + arch/powerpc/include/asm/switch_to.h | 3 + + arch/powerpc/include/asm/time.h | 19 +- + arch/powerpc/include/asm/udbg.h | 10 +- + arch/powerpc/include/asm/uprobes.h | 1 - + arch/powerpc/include/asm/xics.h | 4 +- + arch/powerpc/include/asm/xmon.h | 2 +- + arch/powerpc/kernel/Makefile | 1 + + arch/powerpc/kernel/align.c | 4 +- + arch/powerpc/kernel/asm-offsets.c | 5 +- + arch/powerpc/kernel/btext.c | 16 +- + arch/powerpc/kernel/cpu_setup_power.c | 12 +- + arch/powerpc/kernel/dbell.c | 3 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 24 +- + arch/powerpc/kernel/eeh_cache.c | 2 +- + arch/powerpc/kernel/eeh_driver.c | 162 ++-- + arch/powerpc/kernel/entry_32.S | 54 +- + arch/powerpc/kernel/entry_64.S | 4 +- + arch/powerpc/kernel/epapr_paravirt.c | 2 +- + arch/powerpc/kernel/exceptions-64e.S | 14 +- + arch/powerpc/kernel/exceptions-64s.S | 174 ++-- + arch/powerpc/kernel/fadump.c | 26 +- + arch/powerpc/kernel/fpu.S | 5 + + arch/powerpc/kernel/head_32.h | 9 +- + arch/powerpc/kernel/head_40x.S | 17 +- + arch/powerpc/kernel/head_44x.S | 26 +- + arch/powerpc/kernel/head_64.S | 20 +- + arch/powerpc/kernel/head_book3s_32.S | 4 + + arch/powerpc/kernel/head_booke.h | 3 +- + arch/powerpc/kernel/head_fsl_booke.S | 13 + + arch/powerpc/kernel/hw_breakpoint.c | 4 +- + arch/powerpc/kernel/hw_breakpoint_constraints.c | 4 +- + arch/powerpc/kernel/idle.c | 2 +- + arch/powerpc/kernel/idle_6xx.S | 2 +- + arch/powerpc/kernel/interrupt.c | 3 +- + arch/powerpc/kernel/interrupt_64.S | 46 +- + arch/powerpc/kernel/irq.c | 5 +- + arch/powerpc/kernel/kgdb.c | 4 +- + arch/powerpc/kernel/kprobes.c | 4 +- + arch/powerpc/kernel/l2cr_6xx.S | 6 +- + arch/powerpc/kernel/mce.c | 2 +- + arch/powerpc/kernel/mce_power.c | 18 +- + arch/powerpc/kernel/module.c | 11 +- + arch/powerpc/kernel/module_32.c | 33 + + arch/powerpc/kernel/nvram_64.c | 6 +- + arch/powerpc/kernel/optprobes.c | 12 +- + arch/powerpc/kernel/optprobes_head.S | 4 +- + arch/powerpc/kernel/paca.c | 18 +- + arch/powerpc/kernel/pci-common.c | 2 +- + arch/powerpc/kernel/pci_32.c | 4 +- + arch/powerpc/kernel/process.c | 58 +- + arch/powerpc/kernel/prom.c | 6 +- + arch/powerpc/kernel/prom_init.c | 14 +- + arch/powerpc/kernel/rtas.c | 104 ++- + arch/powerpc/kernel/rtasd.c | 6 +- + arch/powerpc/kernel/security.c | 4 +- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kernel/setup.h | 2 +- + arch/powerpc/kernel/setup_32.c | 4 +- + arch/powerpc/kernel/setup_64.c | 23 +- + arch/powerpc/kernel/signal_32.c | 14 +- + arch/powerpc/kernel/smp.c | 47 +- + arch/powerpc/kernel/swsusp_32.S | 2 +- + arch/powerpc/kernel/swsusp_asm64.S | 2 +- + arch/powerpc/kernel/sysfs.c | 10 +- + arch/powerpc/kernel/time.c | 87 +- + arch/powerpc/kernel/tm.S | 15 +- + arch/powerpc/kernel/trace/ftrace.c | 107 +-- + arch/powerpc/kernel/trace/ftrace_32.S | 118 ++- + arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 15 +- + arch/powerpc/kernel/udbg_16550.c | 10 +- + arch/powerpc/kernel/vecemu.c | 2 +- + arch/powerpc/kernel/vector.S | 10 + + arch/powerpc/kernel/vmlinux.lds.S | 16 +- + arch/powerpc/kernel/watchdog.c | 223 ++++- + arch/powerpc/kexec/core.c | 2 +- + arch/powerpc/kexec/core_64.c | 4 +- + arch/powerpc/kexec/ranges.c | 2 +- + arch/powerpc/kvm/Kconfig | 16 + + arch/powerpc/kvm/book3s_64_entry.S | 11 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 4 + + arch/powerpc/kvm/book3s_hv.c | 860 ++++++++++--------- + arch/powerpc/kvm/book3s_hv.h | 42 + + arch/powerpc/kvm/book3s_hv_builtin.c | 55 +- + arch/powerpc/kvm/book3s_hv_hmi.c | 7 +- + arch/powerpc/kvm/book3s_hv_interrupts.S | 13 +- + arch/powerpc/kvm/book3s_hv_nested.c | 10 +- + arch/powerpc/kvm/book3s_hv_p9_entry.c | 911 ++++++++++++++++++--- + arch/powerpc/kvm/book3s_hv_ras.c | 54 ++ + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 6 - + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 78 +- + arch/powerpc/lib/Makefile | 7 +- + arch/powerpc/lib/code-patching.c | 497 ++--------- + arch/powerpc/lib/feature-fixups.c | 30 +- + arch/powerpc/lib/sstep.c | 4 +- + arch/powerpc/lib/test-code-patching.c | 362 ++++++++ + arch/powerpc/lib/test_code-patching.S | 20 - + arch/powerpc/lib/test_emulate_step.c | 10 +- + arch/powerpc/lib/test_emulate_step_exec_instr.S | 8 +- + arch/powerpc/mm/book3s32/Makefile | 1 - + arch/powerpc/mm/book3s32/kuap.c | 5 +- + arch/powerpc/mm/book3s32/kuep.c | 20 - + arch/powerpc/mm/book3s32/mmu.c | 7 +- + arch/powerpc/mm/book3s32/mmu_context.c | 15 +- + arch/powerpc/mm/book3s64/Makefile | 19 +- + arch/powerpc/mm/book3s64/hash_native.c | 108 +-- + arch/powerpc/mm/book3s64/hash_pgtable.c | 1 - + arch/powerpc/mm/book3s64/hash_utils.c | 117 ++- + .../book3s64/{hash_hugetlbpage.c => hugetlbpage.c} | 4 +- + arch/powerpc/mm/book3s64/mmu_context.c | 34 +- + arch/powerpc/mm/book3s64/pgtable.c | 32 +- + arch/powerpc/mm/book3s64/pkeys.c | 2 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 40 +- + arch/powerpc/mm/book3s64/slb.c | 16 - + arch/powerpc/mm/book3s64/trace.c | 8 + + arch/powerpc/mm/copro_fault.c | 2 + + arch/powerpc/mm/fault.c | 24 + + arch/powerpc/mm/hugetlbpage.c | 16 +- + arch/powerpc/mm/init-common.c | 21 + + arch/powerpc/mm/init_64.c | 59 +- + arch/powerpc/mm/ioremap.c | 20 - + arch/powerpc/mm/kasan/book3s_32.c | 3 +- + arch/powerpc/mm/maccess.c | 17 - + arch/powerpc/mm/mem.c | 2 - + arch/powerpc/mm/mmap.c | 40 +- + arch/powerpc/mm/mmu_context.c | 11 +- + arch/powerpc/mm/nohash/44x.c | 20 +- + arch/powerpc/mm/nohash/8xx.c | 33 - + arch/powerpc/mm/nohash/Makefile | 2 +- + arch/powerpc/mm/nohash/book3e_pgtable.c | 15 + + arch/powerpc/mm/nohash/fsl_book3e.c | 10 +- + arch/powerpc/mm/nohash/kup.c | 33 + + arch/powerpc/mm/nohash/mmu_context.c | 6 +- + arch/powerpc/mm/nohash/tlb.c | 13 +- + arch/powerpc/mm/nohash/tlb_low_64e.S | 40 +- + arch/powerpc/mm/numa.c | 6 +- + arch/powerpc/mm/pgtable.c | 9 +- + arch/powerpc/mm/pgtable_64.c | 14 +- + arch/powerpc/mm/ptdump/Makefile | 2 +- + arch/powerpc/mm/ptdump/ptdump.c | 6 +- + arch/powerpc/mm/slice.c | 20 - + arch/powerpc/net/bpf_jit.h | 17 +- + arch/powerpc/net/bpf_jit_comp.c | 68 +- + arch/powerpc/net/bpf_jit_comp32.c | 101 ++- + arch/powerpc/net/bpf_jit_comp64.c | 72 +- + arch/powerpc/perf/8xx-pmu.c | 2 +- + arch/powerpc/perf/core-book3s.c | 126 ++- + arch/powerpc/perf/generic-compat-pmu.c | 2 +- + arch/powerpc/perf/hv-24x7.c | 2 +- + arch/powerpc/perf/internal.h | 18 +- + arch/powerpc/perf/isa207-common.c | 60 +- + arch/powerpc/perf/power10-pmu.c | 2 +- + arch/powerpc/perf/power5+-pmu.c | 2 +- + arch/powerpc/perf/power5-pmu.c | 2 +- + arch/powerpc/perf/power6-pmu.c | 2 +- + arch/powerpc/perf/power7-pmu.c | 2 +- + arch/powerpc/perf/power8-pmu.c | 2 +- + arch/powerpc/perf/power9-pmu.c | 2 +- + arch/powerpc/perf/ppc970-pmu.c | 2 +- + arch/powerpc/platforms/44x/fsp2.c | 4 +- + arch/powerpc/platforms/4xx/cpm.c | 4 +- + arch/powerpc/platforms/4xx/pci.c | 2 +- + arch/powerpc/platforms/512x/clock-commonclk.c | 52 +- + arch/powerpc/platforms/512x/mpc512x.h | 4 +- + arch/powerpc/platforms/512x/mpc512x_shared.c | 4 +- + arch/powerpc/platforms/52xx/Kconfig | 2 +- + arch/powerpc/platforms/83xx/km83xx.c | 2 +- + arch/powerpc/platforms/83xx/mpc834x_mds.c | 2 +- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 2 +- + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 +- + arch/powerpc/platforms/83xx/mpc83xx.h | 6 +- + arch/powerpc/platforms/83xx/usb.c | 6 +- + arch/powerpc/platforms/85xx/c293pcie.c | 2 +- + arch/powerpc/platforms/85xx/ge_imp3a.c | 2 +- + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 2 +- + arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c | 2 + + arch/powerpc/platforms/85xx/smp.c | 4 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 2 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.h | 2 +- + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 4 +- + arch/powerpc/platforms/Kconfig | 4 +- + arch/powerpc/platforms/Kconfig.cputype | 58 +- + arch/powerpc/platforms/cell/Kconfig | 3 +- + arch/powerpc/platforms/cell/cbe_regs.c | 2 +- + arch/powerpc/platforms/cell/iommu.c | 15 +- + arch/powerpc/platforms/cell/pervasive.c | 1 + + arch/powerpc/platforms/cell/spu_base.c | 6 +- + arch/powerpc/platforms/cell/spu_manage.c | 16 +- + arch/powerpc/platforms/cell/spufs/inode.c | 2 +- + arch/powerpc/platforms/chrp/Kconfig | 2 +- + arch/powerpc/platforms/chrp/pegasos_eth.c | 2 +- + arch/powerpc/platforms/embedded6xx/Kconfig | 2 +- + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 5 +- + arch/powerpc/platforms/embedded6xx/hlwd-pic.h | 2 +- + arch/powerpc/platforms/embedded6xx/holly.c | 2 +- + arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c | 4 +- + arch/powerpc/platforms/embedded6xx/wii.c | 2 +- + arch/powerpc/platforms/maple/Kconfig | 3 +- + arch/powerpc/platforms/microwatt/Kconfig | 1 - + arch/powerpc/platforms/microwatt/rng.c | 2 +- + arch/powerpc/platforms/pasemi/Kconfig | 3 +- + arch/powerpc/platforms/pasemi/msi.c | 2 +- + arch/powerpc/platforms/pasemi/pasemi.h | 2 +- + arch/powerpc/platforms/pasemi/pci.c | 2 +- + arch/powerpc/platforms/pasemi/setup.c | 2 +- + arch/powerpc/platforms/powermac/Kconfig | 3 +- + arch/powerpc/platforms/powermac/cache.S | 4 +- + arch/powerpc/platforms/powermac/feature.c | 2 +- + arch/powerpc/platforms/powermac/low_i2c.c | 3 + + arch/powerpc/platforms/powermac/nvram.c | 2 +- + arch/powerpc/platforms/powermac/pfunc_base.c | 6 +- + arch/powerpc/platforms/powermac/pic.c | 6 +- + arch/powerpc/platforms/powermac/setup.c | 6 +- + arch/powerpc/platforms/powermac/smp.c | 4 +- + arch/powerpc/platforms/powermac/udbg_scc.c | 2 +- + arch/powerpc/platforms/powernv/Kconfig | 2 +- + arch/powerpc/platforms/powernv/idle.c | 27 +- + arch/powerpc/platforms/powernv/opal-core.c | 6 +- + arch/powerpc/platforms/powernv/opal-fadump.c | 2 +- + arch/powerpc/platforms/powernv/opal-imc.c | 6 +- + arch/powerpc/platforms/powernv/opal-lpc.c | 1 + + arch/powerpc/platforms/powernv/opal-msglog.c | 4 +- + arch/powerpc/platforms/powernv/opal-power.c | 2 +- + arch/powerpc/platforms/powernv/opal-powercap.c | 2 +- + arch/powerpc/platforms/powernv/opal-rtc.c | 2 +- + .../powerpc/platforms/powernv/opal-sensor-groups.c | 4 +- + arch/powerpc/platforms/powernv/opal.c | 8 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 4 +- + arch/powerpc/platforms/powernv/powernv.h | 4 +- + arch/powerpc/platforms/powernv/rng.c | 2 +- + arch/powerpc/platforms/powernv/setup.c | 18 +- + arch/powerpc/platforms/ps3/gelic_udbg.c | 2 +- + arch/powerpc/platforms/ps3/mm.c | 4 +- + arch/powerpc/platforms/ps3/os-area.c | 4 +- + arch/powerpc/platforms/ps3/platform.h | 14 +- + arch/powerpc/platforms/ps3/repository.c | 20 +- + arch/powerpc/platforms/ps3/smp.c | 2 +- + arch/powerpc/platforms/ps3/spu.c | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 5 - + arch/powerpc/platforms/pseries/Makefile | 1 - + arch/powerpc/platforms/pseries/event_sources.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 9 +- + arch/powerpc/platforms/pseries/iommu.c | 2 +- + arch/powerpc/platforms/pseries/lpar.c | 71 +- + arch/powerpc/platforms/pseries/lparcfg.c | 5 +- + arch/powerpc/platforms/pseries/mobility.c | 4 + + arch/powerpc/platforms/pseries/pseries.h | 7 +- + arch/powerpc/platforms/pseries/ras.c | 2 + + arch/powerpc/platforms/pseries/rtas-fadump.c | 6 +- + arch/powerpc/platforms/pseries/scanlog.c | 195 ----- + arch/powerpc/platforms/pseries/setup.c | 10 +- + arch/powerpc/platforms/pseries/vas.c | 13 +- + arch/powerpc/platforms/pseries/vio.c | 6 +- + arch/powerpc/sysdev/cpm2.c | 6 +- + arch/powerpc/sysdev/dart_iommu.c | 2 +- + arch/powerpc/sysdev/fsl_mpic_err.c | 4 +- + arch/powerpc/sysdev/fsl_pci.c | 2 +- + arch/powerpc/sysdev/fsl_pci.h | 2 +- + arch/powerpc/sysdev/i8259.c | 2 +- + arch/powerpc/sysdev/ipic.c | 2 +- + arch/powerpc/sysdev/mpic.c | 5 +- + arch/powerpc/sysdev/mpic.h | 10 +- + arch/powerpc/sysdev/mpic_msi.c | 6 +- + arch/powerpc/sysdev/mpic_timer.c | 6 +- + arch/powerpc/sysdev/mpic_u3msi.c | 2 +- + arch/powerpc/sysdev/tsi108_dev.c | 3 +- + arch/powerpc/sysdev/tsi108_pci.c | 2 +- + arch/powerpc/sysdev/udbg_memcons.c | 2 +- + arch/powerpc/sysdev/xics/icp-hv.c | 2 +- + arch/powerpc/sysdev/xics/icp-opal.c | 2 +- + arch/powerpc/sysdev/xics/xics-common.c | 2 +- + arch/powerpc/sysdev/xive/common.c | 214 +++-- + arch/powerpc/sysdev/xive/native.c | 19 +- + arch/powerpc/sysdev/xive/spapr.c | 44 +- + arch/powerpc/sysdev/xive/xive-internal.h | 2 + + arch/powerpc/xmon/xmon.c | 34 +- + arch/powerpc/xmon/xmon_bpts.h | 4 +- + drivers/macintosh/mediabay.c | 2 +- + drivers/misc/cxl/Kconfig | 1 + + drivers/misc/lkdtm/Makefile | 2 +- + drivers/misc/lkdtm/core.c | 2 +- + drivers/misc/ocxl/file.c | 4 +- + include/linux/cuda.h | 2 +- + include/linux/pmu.h | 2 +- + include/uapi/linux/perf_event.h | 5 +- + .../powerpc/security/mitigation-patching.sh | 5 +- + .../selftests/powerpc/security/spectre_v2.c | 2 +- + tools/testing/selftests/powerpc/signal/.gitignore | 2 + + tools/testing/selftests/powerpc/signal/Makefile | 2 + + .../selftests/powerpc/signal/sigreturn_kernel.c | 132 +++ + .../selftests/powerpc/signal/sigreturn_unaligned.c | 43 + + 365 files changed, 5600 insertions(+), 3417 deletions(-) + create mode 100644 arch/powerpc/include/asm/nohash/kup-booke.h + create mode 100644 arch/powerpc/kvm/book3s_hv.h + create mode 100644 arch/powerpc/lib/test-code-patching.c + delete mode 100644 arch/powerpc/lib/test_code-patching.S + delete mode 100644 arch/powerpc/mm/book3s32/kuep.c + rename arch/powerpc/mm/book3s64/{hash_hugetlbpage.c => hugetlbpage.c} (98%) + create mode 100644 arch/powerpc/mm/book3s64/trace.c + create mode 100644 arch/powerpc/mm/nohash/kup.c + delete mode 100644 arch/powerpc/platforms/pseries/scanlog.c + create mode 100644 tools/testing/selftests/powerpc/signal/sigreturn_kernel.c + create mode 100644 tools/testing/selftests/powerpc/signal/sigreturn_unaligned.c +Merging soc-fsl/next (67a4fa80561f soc: fsl: Correct MAINTAINERS database (SOC)) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/freescale/fsl,layerscape-dcfg.txt | 2 +- + Documentation/devicetree/bindings/clock/qoriq-clock.txt | 1 + + MAINTAINERS | 4 ++-- + include/soc/fsl/dpaa2-fd.h | 3 ++- + include/soc/fsl/qe/immap_qe.h | 3 ++- + include/soc/fsl/qe/qe_tdm.h | 4 +++- + include/soc/fsl/qe/ucc_fast.h | 2 +- + include/soc/fsl/qe/ucc_slow.h | 2 +- + 8 files changed, 13 insertions(+), 8 deletions(-) +Merging risc-v/for-next (dacef016c088 riscv: dts: enable more DA9063 functions for the SiFive HiFive Unmatched) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts +CONFLICT (content): Merge conflict in arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts +Resolved 'arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 493561819cf9] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) +Merging s390/for-next (f29b15079e35 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'recursive' strategy. + arch/s390/configs/debug_defconfig | 1 + + arch/s390/configs/defconfig | 1 + + arch/s390/crypto/Makefile | 2 + + arch/s390/crypto/chacha-glue.c | 100 +++++ + arch/s390/crypto/chacha-s390.S | 907 ++++++++++++++++++++++++++++++++++++++ + arch/s390/crypto/chacha-s390.h | 14 + + arch/s390/include/asm/ap.h | 4 +- + arch/s390/include/asm/diag.h | 4 +- + arch/s390/include/asm/nmi.h | 6 +- + arch/s390/include/asm/pci_dma.h | 29 +- + arch/s390/include/asm/processor.h | 3 +- + arch/s390/include/asm/qdio.h | 25 +- + arch/s390/include/asm/vx-insn.h | 117 +++++ + arch/s390/kernel/crash_dump.c | 2 +- + arch/s390/kernel/dis.c | 1 + + arch/s390/kernel/machine_kexec.c | 2 +- + arch/s390/kernel/nmi.c | 43 +- + arch/s390/kernel/process.c | 1 - + arch/s390/kernel/setup.c | 2 +- + arch/s390/kernel/smp.c | 35 +- + arch/s390/kernel/uv.c | 10 +- + arch/s390/mm/cmm.c | 2 +- + arch/s390/mm/fault.c | 8 +- + arch/s390/mm/init.c | 3 + + arch/s390/mm/pgalloc.c | 244 +++++++--- + arch/s390/pci/pci.c | 2 +- + arch/s390/pci/pci_dma.c | 26 +- + arch/s390/pci/pci_irq.c | 6 +- + arch/s390/tools/opcodes.txt | 3 +- + drivers/crypto/Kconfig | 12 + + drivers/iommu/s390-iommu.c | 10 +- + drivers/s390/char/sclp_early.c | 2 +- + drivers/s390/char/vmcp.c | 4 +- + drivers/s390/cio/chsc_sch.c | 5 - + drivers/s390/cio/css.c | 19 - + drivers/s390/cio/device.c | 20 +- + drivers/s390/cio/eadm_sch.c | 5 - + drivers/s390/cio/qdio.h | 7 +- + drivers/s390/cio/qdio_main.c | 210 +++++---- + drivers/s390/cio/qdio_setup.c | 22 +- + drivers/s390/cio/vfio_ccw_drv.c | 5 - + drivers/s390/crypto/vfio_ap_drv.c | 79 +++- + drivers/s390/crypto/zcrypt_api.c | 7 +- + drivers/s390/net/qeth_core_main.c | 36 +- + drivers/s390/scsi/zfcp_qdio.c | 19 +- + 45 files changed, 1698 insertions(+), 367 deletions(-) + create mode 100644 arch/s390/crypto/chacha-glue.c + create mode 100644 arch/s390/crypto/chacha-s390.S + create mode 100644 arch/s390/crypto/chacha-s390.h +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (db0dd9cee822 um: virtio_uml: Allow probing from devicetree) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Removing arch/um/kernel/syscall.c +Merge made by the 'recursive' strategy. + arch/um/.gitignore | 1 + + arch/um/Kconfig | 2 +- + arch/um/drivers/virt-pci.c | 8 ++--- + arch/um/drivers/virtio_uml.c | 54 +++++++++++++++++++++++++++-- + arch/um/include/asm/delay.h | 4 +-- + arch/um/include/asm/irqflags.h | 4 +-- + arch/um/include/asm/processor-generic.h | 2 +- + arch/um/include/asm/thread_info.h | 4 --- + arch/um/include/asm/uaccess.h | 21 ++++++++++-- + arch/um/include/shared/common-offsets.h | 15 -------- + arch/um/include/shared/irq_user.h | 1 - + arch/um/include/shared/kern_util.h | 2 -- + arch/um/include/shared/longjmp.h | 2 +- + arch/um/include/shared/mem_user.h | 5 --- + arch/um/include/shared/net_kern.h | 2 -- + arch/um/include/shared/net_user.h | 1 - + arch/um/include/shared/os.h | 17 ++------- + arch/um/include/shared/registers.h | 6 ++-- + arch/um/include/shared/sigio.h | 1 - + arch/um/kernel/Makefile | 4 ++- + arch/um/kernel/dtb.c | 41 ++++++++++++++++++++++ + arch/um/kernel/exec.c | 1 + + arch/um/kernel/initrd.c | 48 +++----------------------- + arch/um/kernel/ksyms.c | 2 +- + arch/um/kernel/load_file.c | 61 +++++++++++++++++++++++++++++++++ + arch/um/kernel/mem.c | 3 +- + arch/um/kernel/process.c | 6 +--- + arch/um/kernel/skas/uaccess.c | 25 -------------- + arch/um/kernel/syscall.c | 28 --------------- + arch/um/kernel/trap.c | 1 - + arch/um/kernel/um_arch.c | 3 ++ + arch/um/kernel/um_arch.h | 14 ++++++++ + arch/um/os-Linux/registers.c | 4 +-- + arch/um/os-Linux/sigio.c | 13 ++++--- + arch/um/os-Linux/signal.c | 8 ++--- + arch/um/os-Linux/start_up.c | 2 +- + arch/x86/kernel/asm-offsets.c | 3 -- + arch/x86/um/Makefile | 2 +- + arch/x86/um/asm/barrier.h | 1 + + arch/x86/um/asm/segment.h | 8 ----- + arch/x86/um/os-Linux/registers.c | 1 + + arch/x86/um/ptrace_32.c | 1 + + arch/x86/um/ptrace_64.c | 1 + + arch/x86/um/shared/sysdep/syscalls_64.h | 3 -- + arch/x86/um/signal.c | 1 + + arch/x86/um/sys_call_table_32.c | 4 --- + arch/x86/um/sys_call_table_64.c | 17 --------- + arch/x86/um/syscalls_64.c | 14 +++++++- + fs/hostfs/hostfs_kern.c | 3 ++ + include/asm-generic/logic_io.h | 2 +- + lib/logic_iomem.c | 23 +++++++------ + 51 files changed, 265 insertions(+), 235 deletions(-) + create mode 100644 arch/um/kernel/dtb.c + create mode 100644 arch/um/kernel/load_file.c + delete mode 100644 arch/um/kernel/syscall.c + create mode 100644 arch/um/kernel/um_arch.h +Merging xtensa/xtensa-for-next (71874374b46b xtensa: use strscpy to copy strings) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/setup.c | 8 ++++---- + arch/xtensa/platforms/iss/network.c | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) +Merging pidfd/for-next (317465bcc6f4 Merge branch 'fs.idmapped' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Auto-merging fs/xfs/xfs_inode.c +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/idmappings.rst | 72 ---------- + fs/cachefiles/bind.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ksmbd/smbacl.c | 19 +-- + fs/ksmbd/smbacl.h | 5 +- + fs/namespace.c | 73 +++++++--- + fs/nfsd/export.c | 2 +- + fs/open.c | 8 +- + fs/overlayfs/super.c | 2 +- + fs/posix_acl.c | 17 ++- + fs/proc_namespace.c | 2 +- + fs/xfs/xfs_inode.c | 8 +- + fs/xfs/xfs_linux.h | 1 + + fs/xfs/xfs_symlink.c | 4 +- + include/linux/fs.h | 141 ++++++------------- + include/linux/mnt_idmapping.h | 234 +++++++++++++++++++++++++++++++ + security/commoncap.c | 15 +- + 17 files changed, 374 insertions(+), 233 deletions(-) + create mode 100644 include/linux/mnt_idmapping.h +Merging fscrypt/master (b7e072f9b77f fscrypt: improve a few comments) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Already up to date. +Merging fscache/fscache-next (cdf0fa7e16e2 9p, afs, ceph, cifs, nfs: Use current_is_kswapd() rather than gfpflags_allow_blocking()) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Auto-merging include/linux/fs.h +Removing fs/nfs/fscache-index.c +Removing fs/fscache/page.c +Removing fs/fscache/operation.c +Removing fs/fscache/object.c +Removing fs/fscache/netfs.c +Removing fs/fscache/fsdef.c +Auto-merging fs/cifs/inode.c +CONFLICT (content): Merge conflict in fs/cifs/inode.c +Auto-merging fs/cifs/connect.c +Removing fs/cifs/cache.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/caps.c +Removing fs/cachefiles/rdwr.c +CONFLICT (modify/delete): fs/cachefiles/bind.c deleted in fscache/fscache-next and modified in HEAD. Version HEAD of fs/cachefiles/bind.c left in tree. +Auto-merging fs/afs/super.c +Auto-merging fs/afs/file.c +Removing fs/afs/cache.c +Removing Documentation/filesystems/caching/operations.rst +Removing Documentation/filesystems/caching/object.rst +Resolved 'fs/cifs/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/cachefiles/bind.c +rm 'fs/cachefiles/bind.c' +$ git commit --no-edit -v -a +[master 99c9aa6a51e9] Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/caching/backend-api.rst | 850 +++++------- + Documentation/filesystems/caching/cachefiles.rst | 6 +- + Documentation/filesystems/caching/fscache.rst | 525 +++----- + Documentation/filesystems/caching/index.rst | 4 +- + Documentation/filesystems/caching/netfs-api.rst | 1136 +++++----------- + Documentation/filesystems/caching/object.rst | 313 ----- + Documentation/filesystems/caching/operations.rst | 210 --- + Documentation/filesystems/netfs_library.rst | 16 +- + fs/9p/cache.c | 195 +-- + fs/9p/cache.h | 25 +- + fs/9p/v9fs.c | 17 +- + fs/9p/v9fs.h | 13 +- + fs/9p/vfs_addr.c | 57 +- + fs/9p/vfs_dir.c | 13 + + fs/9p/vfs_file.c | 3 +- + fs/9p/vfs_inode.c | 26 +- + fs/9p/vfs_inode_dotl.c | 3 +- + fs/9p/vfs_super.c | 3 + + fs/afs/Makefile | 3 - + fs/afs/cache.c | 68 - + fs/afs/cell.c | 12 - + fs/afs/file.c | 38 +- + fs/afs/inode.c | 101 +- + fs/afs/internal.h | 37 +- + fs/afs/main.c | 14 - + fs/afs/super.c | 1 + + fs/afs/volume.c | 29 +- + fs/afs/write.c | 88 +- + fs/cachefiles/Kconfig | 7 + + fs/cachefiles/Makefile | 6 +- + fs/cachefiles/bind.c | 278 ---- + fs/cachefiles/cache.c | 378 ++++++ + fs/cachefiles/daemon.c | 180 ++- + fs/cachefiles/error_inject.c | 46 + + fs/cachefiles/interface.c | 747 +++++------ + fs/cachefiles/internal.h | 270 ++-- + fs/cachefiles/io.c | 330 +++-- + fs/cachefiles/key.c | 201 ++- + fs/cachefiles/main.c | 22 +- + fs/cachefiles/namei.c | 1223 ++++++++--------- + fs/cachefiles/rdwr.c | 972 -------------- + fs/cachefiles/security.c | 2 +- + fs/cachefiles/volume.c | 139 ++ + fs/cachefiles/xattr.c | 421 +++--- + fs/ceph/addr.c | 102 +- + fs/ceph/cache.c | 218 +--- + fs/ceph/cache.h | 97 +- + fs/ceph/caps.c | 3 +- + fs/ceph/file.c | 13 +- + fs/ceph/inode.c | 22 +- + fs/ceph/super.c | 10 +- + fs/ceph/super.h | 3 +- + fs/cifs/Makefile | 2 +- + fs/cifs/cache.c | 105 -- + fs/cifs/cifsfs.c | 11 +- + fs/cifs/cifsglob.h | 5 +- + fs/cifs/connect.c | 12 - + fs/cifs/file.c | 64 +- + fs/cifs/fscache.c | 333 ++--- + fs/cifs/fscache.h | 126 +- + fs/cifs/inode.c | 19 +- + fs/fs-writeback.c | 8 + + fs/fscache/Kconfig | 3 + + fs/fscache/Makefile | 6 +- + fs/fscache/cache.c | 618 ++++----- + fs/fscache/cookie.c | 1448 +++++++++++---------- + fs/fscache/fsdef.c | 98 -- + fs/fscache/internal.h | 317 +---- + fs/fscache/io.c | 376 ++++-- + fs/fscache/main.c | 147 +-- + fs/fscache/netfs.c | 74 -- + fs/fscache/object.c | 1125 ---------------- + fs/fscache/operation.c | 633 --------- + fs/fscache/page.c | 1242 ------------------ + fs/fscache/proc.c | 47 +- + fs/fscache/stats.c | 293 +---- + fs/fscache/volume.c | 517 ++++++++ + fs/namei.c | 3 +- + fs/netfs/read_helper.c | 10 +- + fs/nfs/Makefile | 2 +- + fs/nfs/client.c | 4 - + fs/nfs/direct.c | 2 + + fs/nfs/file.c | 13 +- + fs/nfs/fscache-index.c | 140 -- + fs/nfs/fscache.c | 490 +++---- + fs/nfs/fscache.h | 180 +-- + fs/nfs/inode.c | 11 +- + fs/nfs/nfstrace.h | 1 - + fs/nfs/read.c | 25 +- + fs/nfs/super.c | 28 +- + fs/nfs/write.c | 8 +- + include/linux/fs.h | 4 + + include/linux/fscache-cache.h | 614 ++------- + include/linux/fscache.h | 1021 ++++++--------- + include/linux/netfs.h | 15 +- + include/linux/nfs_fs.h | 1 - + include/linux/nfs_fs_sb.h | 9 +- + include/linux/writeback.h | 1 + + include/trace/events/cachefiles.h | 527 ++++++-- + include/trace/events/fscache.h | 642 +++++---- + include/trace/events/netfs.h | 5 +- + 101 files changed, 7383 insertions(+), 13498 deletions(-) + delete mode 100644 Documentation/filesystems/caching/object.rst + delete mode 100644 Documentation/filesystems/caching/operations.rst + delete mode 100644 fs/afs/cache.c + delete mode 100644 fs/cachefiles/bind.c + create mode 100644 fs/cachefiles/cache.c + create mode 100644 fs/cachefiles/error_inject.c + delete mode 100644 fs/cachefiles/rdwr.c + create mode 100644 fs/cachefiles/volume.c + delete mode 100644 fs/cifs/cache.c + delete mode 100644 fs/fscache/fsdef.c + delete mode 100644 fs/fscache/netfs.c + delete mode 100644 fs/fscache/object.c + delete mode 100644 fs/fscache/operation.c + delete mode 100644 fs/fscache/page.c + create mode 100644 fs/fscache/volume.c + delete mode 100644 fs/nfs/fscache-index.c +$ git am -3 ../patches/0001-fix-up-for-fs-add-is_idmapped_mnt-helper.patch +Applying: fix up for "fs: add is_idmapped_mnt() helper" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/cachefiles/cache.c +$ git add -A . +$ git commit -v -a --amend +[master 27c6734446e2] Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git + Date: Wed Jan 5 09:51:22 2022 +1100 +Merging afs/afs-next (52af7105eceb afs: Set mtime from the client for yfs create operations) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (2a578233463d Merge branch 'for-next-next-v5.16-20220104' into for-next-20220104) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Removing fs/btrfs/reada.c +Merge made by the 'recursive' strategy. + fs/btrfs/Makefile | 2 +- + fs/btrfs/backref.c | 77 ++- + fs/btrfs/block-group.c | 35 +- + fs/btrfs/block-rsv.c | 84 ++- + fs/btrfs/block-rsv.h | 5 +- + fs/btrfs/btrfs_inode.h | 30 +- + fs/btrfs/compression.c | 11 +- + fs/btrfs/ctree.c | 548 ++++++++++------ + fs/btrfs/ctree.h | 156 ++--- + fs/btrfs/delalloc-space.c | 2 +- + fs/btrfs/delayed-inode.c | 3 +- + fs/btrfs/delayed-ref.c | 25 +- + fs/btrfs/dev-replace.c | 11 +- + fs/btrfs/dir-item.c | 12 +- + fs/btrfs/disk-io.c | 382 ++++++++--- + fs/btrfs/disk-io.h | 11 + + fs/btrfs/extent-tree.c | 144 +++-- + fs/btrfs/extent_io.c | 52 +- + fs/btrfs/file-item.c | 33 +- + fs/btrfs/free-space-cache.c | 322 ++++++---- + fs/btrfs/free-space-cache.h | 10 +- + fs/btrfs/free-space-tree.c | 50 +- + fs/btrfs/inode-item.c | 344 +++++++++- + fs/btrfs/inode-item.h | 96 +++ + fs/btrfs/inode.c | 653 +++++-------------- + fs/btrfs/ioctl.c | 71 ++- + fs/btrfs/print-tree.c | 8 +- + fs/btrfs/props.c | 7 +- + fs/btrfs/qgroup.c | 24 +- + fs/btrfs/reada.c | 1086 -------------------------------- + fs/btrfs/ref-verify.c | 8 +- + fs/btrfs/reflink.c | 2 +- + fs/btrfs/relocation.c | 41 +- + fs/btrfs/root-tree.c | 6 +- + fs/btrfs/scrub.c | 230 +++---- + fs/btrfs/send.c | 404 +++++++++--- + fs/btrfs/space-info.c | 93 +-- + fs/btrfs/space-info.h | 2 +- + fs/btrfs/super.c | 1 - + fs/btrfs/sysfs.c | 11 + + fs/btrfs/tests/btrfs-tests.c | 1 + + fs/btrfs/tests/extent-buffer-tests.c | 17 +- + fs/btrfs/tests/extent-io-tests.c | 52 ++ + fs/btrfs/tests/free-space-tests.c | 186 +++++- + fs/btrfs/tests/free-space-tree-tests.c | 5 +- + fs/btrfs/tests/qgroup-tests.c | 5 +- + fs/btrfs/transaction.c | 162 ++--- + fs/btrfs/transaction.h | 3 +- + fs/btrfs/tree-checker.c | 56 +- + fs/btrfs/tree-defrag.c | 8 - + fs/btrfs/tree-log.c | 734 +++++++++++---------- + fs/btrfs/uuid-tree.c | 10 +- + fs/btrfs/verity.c | 2 +- + fs/btrfs/volumes.c | 121 ++-- + fs/btrfs/volumes.h | 9 +- + fs/btrfs/xattr.c | 8 +- + fs/btrfs/zoned.c | 120 +++- + fs/btrfs/zoned.h | 30 +- + include/trace/events/btrfs.h | 10 +- + include/uapi/linux/btrfs_tree.h | 4 +- + 60 files changed, 3354 insertions(+), 3281 deletions(-) + create mode 100644 fs/btrfs/inode-item.h + delete mode 100644 fs/btrfs/reada.c +Merging ceph/master (fd84bfdddd16 ceph: fix up non-directory creation in SGID directories) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (79145d3bc7aa cifs: protect all accesses to chan_* with chan_lock) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsglob.h +Auto-merging fs/cifs/cifsfs.c +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 8 +- + fs/cifs/cifs_spnego.c | 4 +- + fs/cifs/cifs_spnego.h | 3 +- + fs/cifs/cifs_swn.c | 4 +- + fs/cifs/cifsencrypt.c | 6 +- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifsglob.h | 79 +++++++------- + fs/cifs/cifsproto.h | 31 +++++- + fs/cifs/cifssmb.c | 94 ++++++++++++---- + fs/cifs/connect.c | 284 +++++++++++++++++++++++++++++++++++------------- + fs/cifs/netmisc.c | 4 +- + fs/cifs/ntlmssp.h | 2 + + fs/cifs/sess.c | 188 ++++++++++++++++++++++---------- + fs/cifs/smb1ops.c | 21 +++- + fs/cifs/smb2misc.c | 4 +- + fs/cifs/smb2ops.c | 29 +++-- + fs/cifs/smb2pdu.c | 260 +++++++++++++++++++++++++++++++------------- + fs/cifs/smb2proto.h | 6 +- + fs/cifs/smb2transport.c | 67 +++++++++--- + fs/cifs/transport.c | 89 +++++++++------ + 20 files changed, 838 insertions(+), 347 deletions(-) +Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging erofs/dev (09c543798c3c erofs: use meta buffers for zmap operations) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-erofs | 16 ++ + Documentation/filesystems/erofs.rst | 8 + + fs/erofs/Makefile | 2 +- + fs/erofs/compress.h | 4 +- + fs/erofs/data.c | 138 +++++++++++------ + fs/erofs/decompressor.c | 134 +++++++++------- + fs/erofs/decompressor_lzma.c | 19 +-- + fs/erofs/erofs_fs.h | 18 ++- + fs/erofs/inode.c | 68 ++++---- + fs/erofs/internal.h | 52 ++++++- + fs/erofs/super.c | 121 ++++++--------- + fs/erofs/sysfs.c | 256 +++++++++++++++++++++++++++++++ + fs/erofs/xattr.c | 135 +++++----------- + fs/erofs/xattr.h | 1 - + fs/erofs/zdata.c | 170 ++++++++++++++------ + fs/erofs/zdata.h | 24 ++- + fs/erofs/zmap.c | 159 +++++++++++-------- + include/trace/events/erofs.h | 4 +- + 18 files changed, 870 insertions(+), 459 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-fs-erofs + create mode 100644 fs/erofs/sysfs.c +Merging exfat/dev (4b095fcf2d43 exfat: fix missing REQ_SYNC in exfat_update_bhs()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/balloc.c | 2 +- + fs/exfat/dir.c | 42 ++++++++++++++++------------------------ + fs/exfat/exfat_fs.h | 6 +----- + fs/exfat/fatent.c | 4 +--- + fs/exfat/file.c | 18 ++++++++--------- + fs/exfat/inode.c | 15 +++++++-------- + fs/exfat/misc.c | 3 ++- + fs/exfat/namei.c | 48 ++++++++++++++++++---------------------------- + fs/exfat/nls.c | 2 +- + fs/exfat/super.c | 11 ++++++----- + include/uapi/linux/magic.h | 1 + + 11 files changed, 65 insertions(+), 87 deletions(-) +Merging ext3/for_next (5f0a61886e30 Pull Amir's FAN_RENAME and FAN_REPORT_TARGET_FID support for fanotify.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'recursive' strategy. + fs/notify/dnotify/dnotify.c | 2 +- + fs/notify/fanotify/fanotify.c | 213 ++++++++++++++++++++++++++++--------- + fs/notify/fanotify/fanotify.h | 142 +++++++++++++++++++++++-- + fs/notify/fanotify/fanotify_user.c | 82 +++++++++++--- + fs/notify/fsnotify.c | 53 ++++++--- + fs/notify/group.c | 2 +- + fs/notify/mark.c | 31 +++--- + fs/reiserfs/journal.c | 7 +- + fs/udf/ialloc.c | 2 + + include/linux/dnotify.h | 2 +- + include/linux/fanotify.h | 5 +- + include/linux/fsnotify.h | 9 +- + include/linux/fsnotify_backend.h | 74 +++++++------ + include/uapi/linux/fanotify.h | 12 +++ + 14 files changed, 490 insertions(+), 146 deletions(-) +Merging ext4/dev (856dd2096e2a ext4: fix an use-after-free issue about data=journal writeback mode) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/acl.c | 2 - + fs/ext4/ext4.h | 8 +- + fs/ext4/ext4_jbd2.c | 2 + + fs/ext4/extents.c | 11 +- + fs/ext4/fast_commit.c | 206 ++--- + fs/ext4/fast_commit.h | 27 +- + fs/ext4/file.c | 4 - + fs/ext4/inode.c | 58 +- + fs/ext4/ioctl.c | 13 +- + fs/ext4/mballoc.c | 40 +- + fs/ext4/super.c | 1908 ++++++++++++++++++++++++++++----------------- + fs/ext4/sysfs.c | 34 +- + fs/fs_parser.c | 31 +- + fs/jbd2/journal.c | 2 + + include/linux/fs_parser.h | 2 +- + 15 files changed, 1384 insertions(+), 964 deletions(-) +Merging f2fs/dev (2b642898e5ea f2fs: remove redunant invalidate compress pages) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 12 + + Documentation/filesystems/f2fs.rst | 1 + + fs/f2fs/Kconfig | 1 + + fs/f2fs/checkpoint.c | 6 +- + fs/f2fs/compress.c | 84 +++--- + fs/f2fs/data.c | 351 +++++----------------- + fs/f2fs/f2fs.h | 43 ++- + fs/f2fs/file.c | 503 ++++++++++++++++++++++++++------ + fs/f2fs/gc.c | 26 +- + fs/f2fs/inline.c | 4 +- + fs/f2fs/inode.c | 18 +- + fs/f2fs/iostat.c | 40 ++- + fs/f2fs/node.c | 23 +- + fs/f2fs/recovery.c | 2 +- + fs/f2fs/segment.c | 2 +- + fs/f2fs/segment.h | 3 +- + fs/f2fs/super.c | 46 +++ + fs/f2fs/sysfs.c | 26 +- + fs/f2fs/xattr.c | 40 +-- + include/trace/events/f2fs.h | 27 +- + 20 files changed, 754 insertions(+), 504 deletions(-) +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (073c3ab6ae01 Documentation/filesystem/dax: DAX on virtiofs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/dax.rst | 20 ++++++++- + fs/fuse/dax.c | 36 +++++++++++++++- + fs/fuse/dir.c | 91 +++++++++++++++++++++++++++++++++++++++ + fs/fuse/file.c | 6 +-- + fs/fuse/fuse_i.h | 31 +++++++++++-- + fs/fuse/inode.c | 89 +++++++++++++++++++++++--------------- + fs/fuse/virtio_fs.c | 18 ++++++-- + include/uapi/linux/fuse.h | 55 +++++++++++++++++++++-- + 8 files changed, 294 insertions(+), 52 deletions(-) +Merging gfs2/for-next (9fc8bbcbb697 gfs2: dump inode object for iopen glocks) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 2 +- + fs/gfs2/file.c | 2 +- + fs/gfs2/glock.c | 4 ++-- + fs/gfs2/glops.c | 2 +- + fs/gfs2/inode.c | 2 +- + fs/gfs2/rgrp.c | 7 ++++--- + fs/gfs2/rgrp.h | 2 +- + fs/gfs2/super.c | 10 ++++------ + 8 files changed, 15 insertions(+), 16 deletions(-) +Merging jfs/jfs-next (c48a14dca2cb JFS: fix memleak in jfs_mount) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (d4eeb82674ac ksmbd: Fix smb2_get_name() kernel-doc comment) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'recursive' strategy. + fs/ksmbd/asn1.c | 142 ++++++------------------------------------- + fs/ksmbd/auth.c | 27 ++++---- + fs/ksmbd/auth.h | 10 +-- + fs/ksmbd/connection.h | 7 +-- + fs/ksmbd/mgmt/user_config.c | 10 +++ + fs/ksmbd/mgmt/user_config.h | 1 + + fs/ksmbd/mgmt/user_session.h | 1 - + fs/ksmbd/smb2pdu.c | 64 +++++++++---------- + fs/ksmbd/vfs_cache.h | 10 --- + 9 files changed, 83 insertions(+), 189 deletions(-) +Merging nfs/linux-next (064a91771f7a SUNRPC: use different lock keys for INET6 and LOCAL) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (9ee4f22580f0 nfs: nfs4clinet: check the return value of kstrdup()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Auto-merging include/linux/nfs_fs.h +Merge made by the 'recursive' strategy. + fs/nfs/dir.c | 87 ++++++++++++++++++++++++--------- + fs/nfs/filelayout/filelayout.h | 2 +- + fs/nfs/filelayout/filelayoutdev.c | 4 +- + fs/nfs/nfs3proc.c | 5 +- + fs/nfs/nfs4client.c | 5 +- + fs/nfs/nfs4proc.c | 31 ++++++------ + fs/nfs/nfs4xdr.c | 7 +-- + include/linux/nfs_fs.h | 10 ++-- + include/linux/nfs_xdr.h | 2 +- + include/trace/events/sunrpc.h | 52 ++++++++++++-------- + net/sunrpc/auth_gss/gss_generic_token.c | 6 +-- + net/sunrpc/xprtsock.c | 2 +- + 12 files changed, 136 insertions(+), 77 deletions(-) +Merging nfsd/nfsd-next (2e3f00c5f29f nfsd: improve stateid access bitmask documentation) +$ git merge -m Merge branch 'nfsd-next' of git://git.linux-nfs.org/~bfields/linux.git nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4state.c +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4state.c | 29 ++++++++++++++++++++--------- + fs/nfsd/state.h | 4 ++++ + 2 files changed, 24 insertions(+), 9 deletions(-) +Merging cel/for-next (abd599feaf66 nfsd: Replace use of rwsem with errseq_t) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel/for-next +Auto-merging include/trace/events/sunrpc.h +Auto-merging fs/nfsd/state.h +Auto-merging fs/nfsd/nfsproc.c +Auto-merging fs/nfsd/nfs4state.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfs3proc.c +Resolved 'fs/nfsd/nfs4state.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 87f7adce2d7e] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux +$ git diff -M --stat --summary HEAD^.. + fs/lockd/svc.c | 200 +++++++++------------------- + fs/lockd/svclock.c | 6 +- + fs/nfs/callback.c | 32 ++--- + fs/nfs/export.c | 2 +- + fs/nfsd/filecache.c | 77 +++-------- + fs/nfsd/filecache.h | 1 - + fs/nfsd/netns.h | 15 ++- + fs/nfsd/nfs3proc.c | 6 +- + fs/nfsd/nfs4proc.c | 20 +-- + fs/nfsd/nfs4state.c | 43 ++++-- + fs/nfsd/nfs4xdr.c | 21 +-- + fs/nfsd/nfscache.c | 2 +- + fs/nfsd/nfsctl.c | 24 ++-- + fs/nfsd/nfsd.h | 2 +- + fs/nfsd/nfsproc.c | 8 +- + fs/nfsd/nfssvc.c | 159 +++++++++++----------- + fs/nfsd/state.h | 1 + + fs/nfsd/stats.c | 2 +- + fs/nfsd/stats.h | 4 +- + fs/nfsd/trace.h | 106 +++++++++------ + fs/nfsd/vfs.c | 68 ++++++---- + fs/nfsd/vfs.h | 3 +- + include/linux/exportfs.h | 2 - + include/linux/lockd/lockd.h | 9 +- + include/linux/sunrpc/svc.h | 79 ++++++----- + include/trace/events/sunrpc.h | 297 ++++++++++++++++++++++++------------------ + net/sunrpc/svc.c | 175 +++++++++++-------------- + net/sunrpc/svc_xprt.c | 6 +- + 28 files changed, 653 insertions(+), 717 deletions(-) +Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/file.c +Merge made by the 'recursive' strategy. + fs/ntfs3/file.c | 12 +++-- + fs/ntfs3/frecord.c | 10 ++-- + fs/ntfs3/fslog.c | 6 ++- + fs/ntfs3/inode.c | 8 +++- + fs/ntfs3/xattr.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++------- + 5 files changed, 145 insertions(+), 27 deletions(-) +Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Merge made by the 'recursive' strategy. + fs/orangefs/orangefs-bufmap.c | 7 +++---- + fs/orangefs/orangefs-sysfs.c | 21 ++++++++++++++------- + 2 files changed, 17 insertions(+), 11 deletions(-) +Merging overlayfs/overlayfs-next (5b0a414d06c3 ovl: fix filattr copy-up failure) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (aa39cc675799 jffs2: GC deadlock reading a page that is used in jffs2_write_begin()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-ubifs | 35 +++++++ + MAINTAINERS | 1 + + drivers/mtd/ubi/debug.c | 2 +- + fs/jffs2/file.c | 40 +++++--- + fs/ubifs/Makefile | 2 +- + fs/ubifs/dir.c | 4 +- + fs/ubifs/gc.c | 19 +++- + fs/ubifs/io.c | 21 +++++ + fs/ubifs/replay.c | 2 +- + fs/ubifs/super.c | 23 +++-- + fs/ubifs/sysfs.c | 153 +++++++++++++++++++++++++++++++ + fs/ubifs/ubifs.h | 35 +++++++ + 12 files changed, 309 insertions(+), 28 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-fs-ubifs + create mode 100644 fs/ubifs/sysfs.c +Merging v9fs/9p-next (a403e2bd0026 9p: only copy valid iattrs in 9P2000.L setattr implementation) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Auto-merging fs/9p/vfs_inode_dotl.c +Auto-merging fs/9p/vfs_file.c +Merge made by the 'recursive' strategy. + fs/9p/vfs_file.c | 6 ++---- + fs/9p/vfs_inode_dotl.c | 29 ++++++++++++++++++++--------- + include/net/9p/9p.h | 2 -- + include/net/9p/transport.h | 2 +- + net/9p/Kconfig | 7 +++++++ + net/9p/Makefile | 5 ++++- + net/9p/mod.c | 15 +++++++++++---- + net/9p/trans_fd.c | 14 ++++++++++++-- + net/9p/trans_virtio.c | 2 +- + net/9p/trans_xen.c | 1 + + 10 files changed, 59 insertions(+), 24 deletions(-) +Merging xfs/for-next (6ed6356b0771 xfs: prevent a WARN_ONCE() in xfs_ioc_attr_list()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/xfs_symlink.c +Merge made by the 'recursive' strategy. + fs/xfs/scrub/dir.c | 15 +++++++++++---- + fs/xfs/scrub/quota.c | 4 ++-- + fs/xfs/scrub/repair.c | 3 +++ + fs/xfs/scrub/scrub.c | 4 ---- + fs/xfs/scrub/scrub.h | 1 - + fs/xfs/xfs_buf_item_recover.c | 2 +- + fs/xfs/xfs_icache.c | 3 ++- + fs/xfs/xfs_ioctl.c | 2 +- + fs/xfs/xfs_ioctl.h | 5 +++-- + fs/xfs/xfs_iops.c | 40 ++++------------------------------------ + fs/xfs/xfs_log_recover.c | 24 +++++++++++++++++++++++- + fs/xfs/xfs_mount.c | 10 ---------- + fs/xfs/xfs_qm_syscalls.c | 11 +---------- + fs/xfs/xfs_reflink.c | 5 ++++- + fs/xfs/xfs_super.c | 9 --------- + fs/xfs/xfs_symlink.c | 29 +++++++++++++++++++---------- + fs/xfs/xfs_trans.c | 11 ++++++++++- + 17 files changed, 84 insertions(+), 94 deletions(-) +Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Auto-merging fs/zonefs/super.c +Merge made by the 'recursive' strategy. +Merging iomap/iomap-for-next (5ad448ce2976 iomap: iomap_read_inline_data cleanup) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + include/linux/fs.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging printk/for-next (09b7bafa9876 Merge branch 'for-5.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 104 +++++++++++++++++++++++++-------------------- + lib/vsprintf.c | 4 +- + scripts/gdb/linux/dmesg.py | 35 +++++++-------- + 3 files changed, 78 insertions(+), 65 deletions(-) +Merging pci/next (770851f91de8 Merge branch 'pci/errors') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Auto-merging drivers/pci/controller/pcie-apple.c +Auto-merging drivers/pci/controller/pci-aardvark.c +Auto-merging drivers/pci/controller/dwc/pcie-qcom-ep.c +Auto-merging drivers/pci/controller/dwc/pci-exynos.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 6 + + MAINTAINERS | 13 ++ + arch/arm/include/asm/io.h | 5 +- + arch/arm/mach-dove/pcie.c | 9 +- + arch/arm/mach-iop32x/pci.c | 5 +- + arch/arm/mach-mv78xx0/pcie.c | 5 +- + arch/arm/mach-orion5x/pci.c | 10 +- + arch/arm/mm/ioremap.c | 16 ++- + drivers/char/agp/amd64-agp.c | 24 +--- + drivers/char/agp/sis-agp.c | 25 +--- + drivers/char/agp/via-agp.c | 25 +--- + drivers/pci/access.c | 36 +++--- + drivers/pci/controller/dwc/pci-exynos.c | 4 +- + drivers/pci/controller/dwc/pci-imx6.c | 83 +++++++++++-- + drivers/pci/controller/dwc/pci-keystone.c | 6 +- + drivers/pci/controller/dwc/pcie-designware.c | 7 +- + drivers/pci/controller/dwc/pcie-histb.c | 4 +- + drivers/pci/controller/dwc/pcie-kirin.c | 4 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 4 +- + drivers/pci/controller/dwc/pcie-qcom.c | 14 +-- + drivers/pci/controller/pci-aardvark.c | 79 +++++++++--- + drivers/pci/controller/pci-hyperv.c | 2 +- + drivers/pci/controller/pci-mvebu.c | 70 +++-------- + drivers/pci/controller/pci-thunder-ecam.c | 46 +++---- + drivers/pci/controller/pci-thunder-pem.c | 4 +- + drivers/pci/controller/pci-xgene-msi.c | 6 +- + drivers/pci/controller/pci-xgene.c | 12 +- + drivers/pci/controller/pcie-altera.c | 4 +- + drivers/pci/controller/pcie-apple.c | 10 +- + drivers/pci/controller/pcie-brcmstb.c | 19 ++- + drivers/pci/controller/pcie-iproc.c | 4 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 8 ++ + drivers/pci/controller/pcie-mediatek.c | 11 +- + drivers/pci/controller/pcie-mt7621.c | 2 +- + drivers/pci/controller/pcie-rcar-host.c | 14 +-- + drivers/pci/controller/pcie-rockchip-host.c | 4 +- + drivers/pci/controller/pcie-xilinx-nwl.c | 30 ++--- + drivers/pci/controller/vmd.c | 39 +++++- + drivers/pci/hotplug/TODO | 5 - + drivers/pci/hotplug/cpqphp_ctrl.c | 4 +- + drivers/pci/hotplug/ibmphp_core.c | 74 ----------- + drivers/pci/hotplug/pciehp_hpc.c | 17 +-- + drivers/pci/p2pdma.c | 2 +- + drivers/pci/pci-bridge-emul.c | 119 +++++++++++++++--- + drivers/pci/pci.c | 10 +- + drivers/pci/pcie/aspm.c | 93 +++++++------- + drivers/pci/pcie/dpc.c | 4 +- + drivers/pci/pcie/pme.c | 4 +- + drivers/pci/probe.c | 28 ++--- + drivers/pci/quirks.c | 12 ++ + drivers/pci/switch/switchtec.c | 11 +- + drivers/pcmcia/at91_cf.c | 6 +- + include/linux/pci.h | 9 ++ + include/linux/pci_ids.h | 50 ++++---- + include/uapi/linux/pci_regs.h | 138 ++++++++++----------- + 55 files changed, 680 insertions(+), 575 deletions(-) +Merging pstore/for-next/pstore (a5d05b07961a pstore/ftrace: Allow immediate recording) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/ftrace.c | 46 ++++++++++++++++++++++++++++++---------------- + 1 file changed, 30 insertions(+), 16 deletions(-) +Merging hid/for-next (b92c6c23f16d Merge branch 'for-5.16/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/hid-over-i2c.txt | 2 + + MAINTAINERS | 6 ++ + drivers/hid/hid-apple.c | 107 ++++++++++++++++++--- + drivers/hid/hid-core.c | 93 ++++++++++++++++++ + drivers/hid/hid-debug.c | 35 +++++++ + drivers/hid/hid-input.c | 26 +++-- + drivers/hid/hid-magicmouse.c | 94 ++++++++++++++++-- + drivers/hid/hid-multitouch.c | 3 - + drivers/hid/hid-tmff.c | 8 +- + drivers/hid/hidraw.c | 34 +++---- + drivers/hid/i2c-hid/i2c-hid-acpi.c | 2 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 24 +++-- + drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 2 +- + drivers/hid/i2c-hid/i2c-hid-of.c | 10 +- + drivers/hid/i2c-hid/i2c-hid.h | 2 +- + drivers/hid/surface-hid/surface_hid_core.c | 25 +---- + drivers/hid/usbhid/hid-core.c | 19 ++-- + include/linux/hid.h | 95 ++++++------------ + 18 files changed, 426 insertions(+), 161 deletions(-) +Merging i2c/i2c/for-next (8224d7067bec Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Removing drivers/i2c/busses/i2c-xlr.c +Auto-merging drivers/i2c/busses/Kconfig +Removing Documentation/devicetree/bindings/i2c/i2c-exynos5.txt +Removing Documentation/devicetree/bindings/i2c/brcm,bcm2835-i2c.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/aspeed,i2c.yaml | 1 - + .../devicetree/bindings/i2c/brcm,bcm2835-i2c.txt | 22 - + .../devicetree/bindings/i2c/brcm,bcm2835-i2c.yaml | 54 +++ + .../devicetree/bindings/i2c/i2c-exynos5.txt | 53 --- + .../devicetree/bindings/i2c/i2c-exynos5.yaml | 133 ++++++ + .../devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 2 + + drivers/i2c/busses/Kconfig | 18 +- + drivers/i2c/busses/Makefile | 1 - + drivers/i2c/busses/i2c-aspeed.c | 2 - + drivers/i2c/busses/i2c-designware-core.h | 13 +- + drivers/i2c/busses/i2c-designware-master.c | 7 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 51 ++- + drivers/i2c/busses/i2c-designware-platdrv.c | 2 + + drivers/i2c/busses/i2c-exynos5.c | 110 ++++- + drivers/i2c/busses/i2c-i801.c | 288 +++++-------- + drivers/i2c/busses/i2c-imx.c | 92 +++- + drivers/i2c/busses/i2c-mpc.c | 23 +- + drivers/i2c/busses/i2c-rcar.c | 26 +- + drivers/i2c/busses/i2c-rk3x.c | 7 + + drivers/i2c/busses/i2c-sh_mobile.c | 26 +- + drivers/i2c/busses/i2c-stm32f7.c | 14 +- + drivers/i2c/busses/i2c-tegra.c | 69 ++- + drivers/i2c/busses/i2c-xlp9xx.c | 7 - + drivers/i2c/busses/i2c-xlr.c | 470 --------------------- + drivers/i2c/i2c-core-base.c | 2 + + drivers/i2c/muxes/i2c-mux-gpio.c | 53 +-- + 26 files changed, 595 insertions(+), 951 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/brcm,bcm2835-i2c.txt + create mode 100644 Documentation/devicetree/bindings/i2c/brcm,bcm2835-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-exynos5.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-exynos5.yaml + delete mode 100644 drivers/i2c/busses/i2c-xlr.c +Merging i3c/i3c/next (3f43926f2712 i3c/master/mipi-i3c-hci: Fix a potentially infinite loop in 'hci_dat_v1_get_index()') +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master.c | 3 ++- + drivers/i3c/master/mipi-i3c-hci/dat_v1.c | 4 +--- + drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +- + drivers/i3c/master/mipi-i3c-hci/hci.h | 2 +- + 4 files changed, 5 insertions(+), 6 deletions(-) +Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (660d187887cf hwmon: (xgene-hwmon) Add free before exiting xgene_hwmon_probe) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Removing include/linux/platform_data/ntc_thermistor.h +Auto-merging include/linux/pci_ids.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ntc-thermistor.yaml | 1 + + .../devicetree/bindings/hwmon/ti,ina2xx.yaml | 22 + + .../devicetree/bindings/trivial-devices.yaml | 8 + + Documentation/hwmon/asus_wmi_ec_sensors.rst | 38 + + Documentation/hwmon/asus_wmi_sensors.rst | 78 ++ + Documentation/hwmon/ina238.rst | 56 ++ + Documentation/hwmon/index.rst | 5 + + Documentation/hwmon/ir38064.rst | 28 +- + Documentation/hwmon/mp5023.rst | 84 ++ + Documentation/hwmon/nzxt-smart2.rst | 62 ++ + MAINTAINERS | 27 + + arch/x86/kernel/amd_nb.c | 5 + + drivers/hwmon/Kconfig | 51 +- + drivers/hwmon/Makefile | 4 + + drivers/hwmon/adm1021.c | 23 +- + drivers/hwmon/adm1031.c | 3 +- + drivers/hwmon/asus_wmi_ec_sensors.c | 621 +++++++++++++++ + drivers/hwmon/asus_wmi_sensors.c | 664 ++++++++++++++++ + drivers/hwmon/dell-smm-hwmon.c | 70 +- + drivers/hwmon/f71882fg.c | 2 + + drivers/hwmon/ina238.c | 644 +++++++++++++++ + drivers/hwmon/jc42.c | 4 + + drivers/hwmon/k10temp.c | 36 +- + drivers/hwmon/mr75203.c | 2 +- + drivers/hwmon/nct6775.c | 10 +- + drivers/hwmon/ntc_thermistor.c | 299 ++++--- + drivers/hwmon/nzxt-smart2.c | 829 ++++++++++++++++++++ + drivers/hwmon/pmbus/Kconfig | 29 +- + drivers/hwmon/pmbus/Makefile | 2 + + drivers/hwmon/pmbus/delta-ahe50dc-fan.c | 114 +++ + drivers/hwmon/pmbus/ir38064.c | 28 +- + drivers/hwmon/pmbus/mp5023.c | 67 ++ + drivers/hwmon/raspberrypi-hwmon.c | 7 +- + drivers/hwmon/sht4x.c | 7 + + drivers/hwmon/tmp401.c | 863 ++++++++++----------- + drivers/hwmon/xgene-hwmon.c | 6 +- + include/linux/hwmon.h | 4 +- + include/linux/pci_ids.h | 1 + + include/linux/platform_data/ntc_thermistor.h | 50 -- + 39 files changed, 4118 insertions(+), 736 deletions(-) + create mode 100644 Documentation/hwmon/asus_wmi_ec_sensors.rst + create mode 100644 Documentation/hwmon/asus_wmi_sensors.rst + create mode 100644 Documentation/hwmon/ina238.rst + create mode 100644 Documentation/hwmon/mp5023.rst + create mode 100644 Documentation/hwmon/nzxt-smart2.rst + create mode 100644 drivers/hwmon/asus_wmi_ec_sensors.c + create mode 100644 drivers/hwmon/asus_wmi_sensors.c + create mode 100644 drivers/hwmon/ina238.c + create mode 100644 drivers/hwmon/nzxt-smart2.c + create mode 100644 drivers/hwmon/pmbus/delta-ahe50dc-fan.c + create mode 100644 drivers/hwmon/pmbus/mp5023.c + delete mode 100644 include/linux/platform_data/ntc_thermistor.h +Merging jc_docs/docs-next (82ca67321f55 Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/Makefile | 11 +- + Documentation/admin-guide/hw-vuln/spectre.rst | 2 +- + Documentation/arc/arc.rst | 85 +++ + Documentation/arc/features.rst | 3 + + Documentation/arc/index.rst | 17 + + Documentation/arch.rst | 1 + + Documentation/conf.py | 102 +++- + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kgdb.rst | 4 +- + Documentation/dev-tools/ktap.rst | 298 +++++++++++ + Documentation/dev-tools/kunit/architecture.rst | 204 ++++++++ + Documentation/dev-tools/kunit/faq.rst | 73 ++- + Documentation/dev-tools/kunit/index.rst | 172 +++--- + .../dev-tools/kunit/kunit_suitememorydiagram.svg | 81 +++ + Documentation/dev-tools/kunit/run_manual.rst | 57 ++ + Documentation/dev-tools/kunit/run_wrapper.rst | 247 +++++++++ + Documentation/dev-tools/kunit/start.rst | 198 +++---- + Documentation/dev-tools/kunit/style.rst | 105 ++-- + Documentation/dev-tools/kunit/usage.rst | 578 +++++++++------------ + Documentation/doc-guide/sphinx.rst | 11 + + Documentation/filesystems/locking.rst | 5 - + Documentation/networking/rds.rst | 2 +- + Documentation/process/submitting-patches.rst | 19 - + Documentation/scheduler/sched-bwc.rst | 5 +- + Documentation/security/self-protection.rst | 3 +- + Documentation/sphinx-static/theme_overrides.css | 16 +- + Documentation/sphinx-static/theme_rtd_colors.css | 37 ++ + Documentation/sphinx/kernel_abi.py | 2 +- + Documentation/sphinx/kernel_feat.py | 2 +- + Documentation/trace/boottime-trace.rst | 4 +- + Documentation/translations/zh_CN/PCI/index.rst | 7 +- + Documentation/translations/zh_CN/PCI/msi-howto.rst | 233 +++++++++ + .../translations/zh_CN/PCI/pci-iov-howto.rst | 170 ++++++ + .../translations/zh_CN/PCI/pciebus-howto.rst | 192 +++++++ + Documentation/translations/zh_CN/PCI/sysfs-pci.rst | 126 +++++ + .../zh_CN/accounting/delay-accounting.rst | 111 ++++ + .../translations/zh_CN/accounting/index.rst | 4 +- + .../translations/zh_CN/accounting/taskstats.rst | 145 ++++++ + .../translations/zh_CN/admin-guide/README.rst | 11 +- + .../translations/zh_CN/admin-guide/cputopology.rst | 96 ++++ + .../translations/zh_CN/admin-guide/index.rst | 2 +- + Documentation/translations/zh_CN/cpu-freq/core.rst | 24 +- + .../translations/zh_CN/cpu-freq/cpu-drivers.rst | 139 ++--- + .../translations/zh_CN/cpu-freq/cpufreq-stats.rst | 45 +- + .../translations/zh_CN/dev-tools/index.rst | 2 +- + .../zh_CN/{sparse.txt => dev-tools/sparse.rst} | 67 ++- + Documentation/translations/zh_CN/index.rst | 7 +- + .../translations/zh_CN/scheduler/completion.rst | 256 +++++++++ + .../translations/zh_CN/scheduler/index.rst | 44 ++ + .../translations/zh_CN/scheduler/sched-arch.rst | 76 +++ + .../translations/zh_CN/scheduler/sched-bwc.rst | 204 ++++++++ + .../zh_CN/scheduler/sched-capacity.rst | 390 ++++++++++++++ + .../zh_CN/scheduler/sched-design-CFS.rst | 205 ++++++++ + .../translations/zh_CN/scheduler/sched-domains.rst | 72 +++ + Documentation/vm/overcommit-accounting.rst | 3 +- + MAINTAINERS | 7 +- + scripts/sphinx-pre-install | 1 + + 57 files changed, 4175 insertions(+), 809 deletions(-) + create mode 100644 Documentation/arc/arc.rst + create mode 100644 Documentation/arc/features.rst + create mode 100644 Documentation/arc/index.rst + create mode 100644 Documentation/dev-tools/ktap.rst + create mode 100644 Documentation/dev-tools/kunit/architecture.rst + create mode 100644 Documentation/dev-tools/kunit/kunit_suitememorydiagram.svg + create mode 100644 Documentation/dev-tools/kunit/run_manual.rst + create mode 100644 Documentation/dev-tools/kunit/run_wrapper.rst + create mode 100644 Documentation/sphinx-static/theme_rtd_colors.css + create mode 100644 Documentation/translations/zh_CN/PCI/msi-howto.rst + create mode 100644 Documentation/translations/zh_CN/PCI/pci-iov-howto.rst + create mode 100644 Documentation/translations/zh_CN/PCI/pciebus-howto.rst + create mode 100644 Documentation/translations/zh_CN/PCI/sysfs-pci.rst + create mode 100644 Documentation/translations/zh_CN/accounting/delay-accounting.rst + create mode 100644 Documentation/translations/zh_CN/accounting/taskstats.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/cputopology.rst + rename Documentation/translations/zh_CN/{sparse.txt => dev-tools/sparse.rst} (58%) + create mode 100644 Documentation/translations/zh_CN/scheduler/completion.rst + create mode 100644 Documentation/translations/zh_CN/scheduler/index.rst + create mode 100644 Documentation/translations/zh_CN/scheduler/sched-arch.rst + create mode 100644 Documentation/translations/zh_CN/scheduler/sched-bwc.rst + create mode 100644 Documentation/translations/zh_CN/scheduler/sched-capacity.rst + create mode 100644 Documentation/translations/zh_CN/scheduler/sched-design-CFS.rst + create mode 100644 Documentation/translations/zh_CN/scheduler/sched-domains.rst +Merging v4l-dvb/master (68b9bcc8a534 media: ipu3-cio2: Add support for instantiating i2c-clients for VCMs) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging drivers/staging/media/tegra-vde/vde.c +Removing drivers/staging/media/atomisp/pci/sh_css_stream.c +Removing drivers/staging/media/atomisp/pci/sh_css_shading.c +Removing drivers/staging/media/atomisp/pci/sh_css_morph.c +Removing drivers/staging/media/atomisp/pci/sh_css_metadata.c +Removing drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_states.c +Removing drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_configs.c +Removing drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_params.c +Removing drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_configs.c +Auto-merging MAINTAINERS +Removing Documentation/userspace-api/media/rc/lirc-set-rec-timeout-reports.rst +Removing Documentation/devicetree/bindings/media/renesas,jpu.txt +Removing Documentation/devicetree/bindings/media/i2c/adv748x.txt +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + .../admin-guide/media/platform-cardlist.rst | 1 + + .../media/allwinner,sun4i-a10-video-engine.yaml | 1 + + .../bindings/media/allwinner,sun50i-h6-vpu-g2.yaml | 64 + + .../devicetree/bindings/media/i2c/adv748x.txt | 116 - + .../devicetree/bindings/media/i2c/adv748x.yaml | 212 ++ + .../devicetree/bindings/media/renesas,jpu.txt | 25 - + .../devicetree/bindings/media/renesas,jpu.yaml | 65 + + .../devicetree/bindings/media/st,stm32-dma2d.yaml | 71 + + Documentation/driver-api/media/drivers/index.rst | 1 + + .../userspace-api/media/cec/cec-ioc-receive.rst | 49 +- + .../userspace-api/media/lirc.h.rst.exceptions | 2 + + .../userspace-api/media/rc/lirc-dev-intro.rst | 8 +- + Documentation/userspace-api/media/rc/lirc-func.rst | 1 - + .../media/rc/lirc-set-rec-timeout-reports.rst | 49 - + Documentation/userspace-api/media/v4l/biblio.rst | 10 + + .../userspace-api/media/v4l/capture.c.rst | 52 +- + Documentation/userspace-api/media/v4l/control.rst | 9 + + .../userspace-api/media/v4l/dev-decoder.rst | 17 + + .../media/v4l/ext-ctrls-codec-stateless.rst | 573 ++++ + .../media/v4l/libv4l-introduction.rst | 2 +- + .../userspace-api/media/v4l/pixfmt-compressed.rst | 15 + + .../userspace-api/media/v4l/subdev-formats.rst | 2 +- + .../userspace-api/media/v4l/v4l2grab.c.rst | 8 +- + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 8 + + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 12 + + .../userspace-api/media/videodev2.h.rst.exceptions | 2 + + MAINTAINERS | 28 +- + drivers/media/Kconfig | 8 +- + drivers/media/cec/core/cec-adap.c | 46 +- + drivers/media/cec/core/cec-api.c | 8 +- + drivers/media/cec/core/cec-core.c | 3 + + drivers/media/cec/core/cec-pin-priv.h | 1 - + drivers/media/cec/core/cec-pin.c | 32 +- + drivers/media/common/b2c2/flexcop.c | 11 +- + drivers/media/common/saa7146/saa7146_fops.c | 5 +- + drivers/media/common/videobuf2/frame_vector.c | 15 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 8 +- + drivers/media/dvb-core/dmxdev.c | 30 +- + drivers/media/dvb-core/dvb_demux.c | 12 +- + drivers/media/dvb-core/dvb_frontend.c | 21 +- + drivers/media/dvb-core/dvb_vb2.c | 4 - + drivers/media/dvb-core/dvbdev.c | 12 +- + drivers/media/dvb-frontends/cx24113.c | 2 +- + drivers/media/dvb-frontends/dib8000.c | 4 +- + drivers/media/dvb-frontends/dib9000.c | 4 +- + drivers/media/dvb-frontends/drxd_hard.c | 8 - + drivers/media/dvb-frontends/drxk_hard.c | 23 +- + drivers/media/dvb-frontends/m88ds3103.c | 6 +- + drivers/media/dvb-frontends/s5h1411.c | 2 +- + drivers/media/dvb-frontends/si2168.c | 43 +- + drivers/media/dvb-frontends/si2168_priv.h | 2 +- + drivers/media/dvb-frontends/si21xx.c | 7 +- + drivers/media/dvb-frontends/sp887x.c | 4 +- + drivers/media/dvb-frontends/stb6100.c | 2 +- + drivers/media/dvb-frontends/stv0367.c | 6 +- + drivers/media/i2c/Kconfig | 12 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/adv7511-v4l2.c | 22 - + drivers/media/i2c/adv7604.c | 18 +- + drivers/media/i2c/adv7842.c | 10 - + drivers/media/i2c/ccs/ccs-core.c | 12 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 20 - + drivers/media/i2c/dw9768.c | 6 + + drivers/media/i2c/hi556.c | 70 +- + drivers/media/i2c/hi846.c | 14 +- + drivers/media/i2c/imx208.c | 82 +- + drivers/media/i2c/imx274.c | 102 +- + drivers/media/i2c/imx290.c | 2 +- + drivers/media/i2c/imx319.c | 2 +- + drivers/media/i2c/imx355.c | 2 +- + drivers/media/i2c/max9286.c | 7 +- + drivers/media/i2c/ov13858.c | 2 +- + drivers/media/i2c/ov2740.c | 69 +- + drivers/media/i2c/ov5670.c | 80 +- + drivers/media/i2c/ov5675.c | 71 +- + drivers/media/i2c/ov5693.c | 1537 +++++++++ + drivers/media/i2c/ov8856.c | 162 +- + drivers/media/i2c/ov8865.c | 478 ++- + drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 6 - + drivers/media/mc/mc-entity.c | 22 +- + drivers/media/pci/b2c2/flexcop-pci.c | 3 + + drivers/media/pci/bt8xx/bttv-driver.c | 4 +- + drivers/media/pci/cobalt/cobalt-cpld.c | 5 +- + drivers/media/pci/cx18/cx18-alsa-main.c | 6 - + drivers/media/pci/cx25821/cx25821-core.c | 7 - + drivers/media/pci/intel/ipu3/cio2-bridge.c | 100 +- + drivers/media/pci/intel/ipu3/cio2-bridge.h | 16 +- + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 27 +- + drivers/media/pci/ivtv/ivtv-alsa-main.c | 6 - + drivers/media/pci/ivtv/ivtvfb.c | 2 +- + drivers/media/pci/pt3/pt3.c | 58 +- + drivers/media/pci/saa7134/saa7134-go7007.c | 7 +- + drivers/media/pci/saa7146/hexium_gemini.c | 7 +- + drivers/media/pci/saa7146/hexium_orion.c | 8 +- + drivers/media/pci/saa7146/mxb.c | 11 +- + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 12 +- + drivers/media/pci/tw5864/tw5864-core.c | 5 +- + drivers/media/platform/Kconfig | 12 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/allegro-dvt/allegro-core.c | 2 +- + drivers/media/platform/aspeed-video.c | 14 +- + drivers/media/platform/coda/coda-common.c | 16 +- + drivers/media/platform/coda/coda-jpeg.c | 21 +- + drivers/media/platform/coda/imx-vdoa.c | 6 +- + drivers/media/platform/davinci/vpbe_osd.c | 2 +- + drivers/media/platform/davinci/vpif_capture.c | 12 - + drivers/media/platform/imx-pxp.c | 35 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 7 - + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +- + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 2 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 1 + + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 6 +- + .../platform/mtk-vcodec/mtk_vcodec_dec_stateless.c | 1 - + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 208 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 6 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.c | 10 - + .../media/platform/mtk-vcodec/mtk_vcodec_util.h | 45 +- + .../platform/mtk-vcodec/vdec/vdec_h264_req_if.c | 8 +- + .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 9 +- + .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 3 +- + drivers/media/platform/mtk-vcodec/venc_vpu_if.c | 1 - + drivers/media/platform/mtk-vcodec/venc_vpu_if.h | 1 - + drivers/media/platform/mtk-vpu/mtk_vpu.c | 4 +- + drivers/media/platform/omap3isp/isp.c | 3 +- + drivers/media/platform/omap3isp/isph3a_af.c | 2 +- + drivers/media/platform/omap3isp/omap3isp.h | 2 + + drivers/media/platform/qcom/camss/camss-vfe-170.c | 7 - + drivers/media/platform/qcom/venus/core.c | 11 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 32 +- + drivers/media/platform/rcar-vin/rcar-core.c | 3 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 23 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 17 + + drivers/media/platform/rcar-vin/rcar-v4l2.c | 15 +- + drivers/media/platform/rcar_fdp1.c | 7 +- + .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +- + drivers/media/platform/s3c-camif/camif-core.c | 2 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 6 +- + drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 9 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 1 + + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 12 +- + drivers/media/platform/sti/hva/hva-hw.c | 4 +- + drivers/media/platform/stm32/Makefile | 2 + + drivers/media/platform/stm32/dma2d/dma2d-hw.c | 133 + + drivers/media/platform/stm32/dma2d/dma2d-regs.h | 113 + + drivers/media/platform/stm32/dma2d/dma2d.c | 739 +++++ + drivers/media/platform/stm32/dma2d/dma2d.h | 135 + + drivers/media/radio/radio-si476x.c | 6 - + drivers/media/radio/si470x/radio-si470x-i2c.c | 20 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 16 +- + drivers/media/rc/Kconfig | 2 +- + drivers/media/rc/igorplugusb.c | 4 +- + drivers/media/rc/iguanair.c | 3 - + drivers/media/rc/ir-rx51.c | 16 +- + drivers/media/rc/ir-spi.c | 6 - + drivers/media/rc/lirc_dev.c | 5 - + drivers/media/rc/mceusb.c | 8 +- + drivers/media/rc/pwm-ir-tx.c | 18 +- + drivers/media/rc/redrat3.c | 22 +- + drivers/media/rc/streamzap.c | 122 +- + drivers/media/rc/winbond-cir.c | 1 - + drivers/media/spi/cxd2880-spi.c | 13 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 2 +- + drivers/media/test-drivers/vidtv/vidtv_psi.c | 12 +- + drivers/media/tuners/msi001.c | 7 + + drivers/media/tuners/mxl5005s.c | 14 +- + drivers/media/tuners/r820t.c | 24 +- + drivers/media/tuners/si2157.c | 307 +- + drivers/media/tuners/si2157_priv.h | 44 +- + drivers/media/tuners/tua9001.c | 6 +- + drivers/media/usb/au0828/au0828-i2c.c | 7 - + drivers/media/usb/b2c2/flexcop-usb.c | 28 +- + drivers/media/usb/b2c2/flexcop-usb.h | 12 +- + drivers/media/usb/cpia2/cpia2_usb.c | 4 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 3 + + drivers/media/usb/dvb-usb/dib0700_core.c | 28 +- + drivers/media/usb/dvb-usb/dw2102.c | 338 +- + drivers/media/usb/dvb-usb/m920x.c | 12 +- + drivers/media/usb/em28xx/em28xx-cards.c | 18 +- + drivers/media/usb/em28xx/em28xx-core.c | 4 +- + drivers/media/usb/go7007/go7007-driver.c | 2 +- + drivers/media/usb/gspca/m5602/m5602_s5k83a.c | 13 +- + drivers/media/usb/pvrusb2/pvrusb2-encoder.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 41 +- + drivers/media/usb/s2255/s2255drv.c | 4 +- + drivers/media/usb/siano/smsusb.c | 4 - + drivers/media/usb/stk1160/stk1160-core.c | 4 +- + drivers/media/usb/uvc/uvc_ctrl.c | 4 +- + drivers/media/usb/uvc/uvc_driver.c | 13 +- + drivers/media/usb/uvc/uvc_v4l2.c | 6 +- + drivers/media/usb/uvc/uvc_video.c | 4 + + drivers/media/usb/uvc/uvcvideo.h | 2 +- + drivers/media/v4l2-core/Kconfig | 4 + + drivers/media/v4l2-core/Makefile | 1 + + drivers/media/v4l2-core/v4l2-ctrls-core.c | 180 ++ + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 20 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 5 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 21 + + drivers/media/v4l2-core/v4l2-vp9.c | 1850 +++++++++++ + drivers/staging/media/Kconfig | 2 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/atomisp/Makefile | 24 +- + drivers/staging/media/atomisp/TODO | 191 +- + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 119 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 121 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 130 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 313 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 118 +- + drivers/staging/media/atomisp/i2c/gc0310.h | 3 +- + drivers/staging/media/atomisp/i2c/gc2235.h | 3 +- + drivers/staging/media/atomisp/i2c/ov2680.h | 207 +- + drivers/staging/media/atomisp/i2c/ov2722.h | 3 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 248 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 6 +- + drivers/staging/media/atomisp/pci/atomisp_compat.h | 2 - + .../media/atomisp/pci/atomisp_compat_css20.c | 92 +- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 43 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 21 +- + .../staging/media/atomisp/pci/atomisp_internal.h | 7 + + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 312 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 54 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 4 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 33 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.h | 3 +- + .../atomisp/pci/camera/pipe/src/pipe_binarydesc.c | 25 +- + .../pci/css_2400_system/hive/ia_css_isp_configs.c | 386 --- + .../pci/css_2400_system/hive/ia_css_isp_params.c | 3420 -------------------- + .../pci/css_2401_system/hive/ia_css_isp_configs.c | 386 --- + .../pci/css_2401_system/hive/ia_css_isp_states.c | 224 -- + .../atomisp/pci/hive_isp_css_common/host/gdc.c | 11 - + .../staging/media/atomisp/pci/ia_css_acc_types.h | 5 - + .../media/atomisp/pci/ia_css_event_public.h | 17 +- + .../staging/media/atomisp/pci/ia_css_isp_configs.c | 321 ++ + .../staging/media/atomisp/pci/ia_css_isp_configs.h | 119 +- + .../{css_2401_system/hive => }/ia_css_isp_params.c | 23 - + .../staging/media/atomisp/pci/ia_css_isp_params.h | 3 - + .../{css_2400_system/hive => }/ia_css_isp_states.c | 0 + drivers/staging/media/atomisp/pci/ia_css_pipe.h | 4 +- + .../staging/media/atomisp/pci/ia_css_pipe_public.h | 26 - + drivers/staging/media/atomisp/pci/ia_css_stream.h | 4 - + .../media/atomisp/pci/ia_css_stream_public.h | 19 +- + .../staging/media/atomisp/pci/input_system_local.h | 134 + + .../pci/isp/kernels/bh/bh_2/ia_css_bh.host.c | 2 - + .../copy_output_1.0/ia_css_copy_output.host.c | 8 +- + .../copy_output_1.0/ia_css_copy_output.host.h | 6 +- + .../isp/kernels/crop/crop_1.0/ia_css_crop.host.c | 28 +- + .../isp/kernels/crop/crop_1.0/ia_css_crop.host.h | 14 +- + .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 8 +- + .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h | 6 +- + .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 28 +- + .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h | 14 +- + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.c | 1 - + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.h | 1 - + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_param.h | 1 - + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h | 1 - + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 16 +- + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 6 +- + .../yuv444_io_ls/ia_css_yuv444_io.host.c | 18 +- + .../yuv444_io_ls/ia_css_yuv444_io.host.h | 6 +- + .../iterator/iterator_1.0/ia_css_iterator.host.c | 11 +- + .../kernels/output/output_1.0/ia_css_output.host.c | 69 +- + .../kernels/output/output_1.0/ia_css_output.host.h | 42 +- + .../kernels/qplane/qplane_2/ia_css_qplane.host.c | 30 +- + .../kernels/qplane/qplane_2/ia_css_qplane.host.h | 16 +- + .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 38 +- + .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.h | 22 +- + .../raw_aa_binning_1.0/ia_css_raa.host.c | 2 - + .../pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.c | 30 +- + .../pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.h | 16 +- + .../pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c | 5 - + .../pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c | 68 - + .../pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.h | 33 - + .../pci/isp/kernels/sc/sc_1.0/ia_css_sc_types.h | 14 - + .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 33 +- + .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h | 14 +- + .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h | 4 +- + .../pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 32 +- + .../pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.h | 8 +- + .../atomisp/pci/isp/modes/interface/isp_const.h | 14 +- + .../media/atomisp/pci/isp2400_input_system_local.h | 126 - + .../atomisp/pci/isp2401_input_system_global.h | 12 - + .../media/atomisp/pci/isp2401_input_system_local.h | 26 - + .../pci/runtime/binary/interface/ia_css_binary.h | 3 - + .../media/atomisp/pci/runtime/binary/src/binary.c | 513 +-- + .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 2 +- + .../pci/runtime/frame/interface/ia_css_frame.h | 24 +- + .../media/atomisp/pci/runtime/frame/src/frame.c | 116 +- + .../atomisp/pci/runtime/isys/src/virtual_isys.c | 11 - + .../atomisp/pci/runtime/pipeline/src/pipeline.c | 3 +- + drivers/staging/media/atomisp/pci/sh_css.c | 2047 ++++-------- + drivers/staging/media/atomisp/pci/sh_css_defs.h | 58 +- + .../staging/media/atomisp/pci/sh_css_firmware.c | 16 +- + .../staging/media/atomisp/pci/sh_css_firmware.h | 3 - + .../staging/media/atomisp/pci/sh_css_internal.h | 36 +- + .../staging/media/atomisp/pci/sh_css_metadata.c | 17 - + drivers/staging/media/atomisp/pci/sh_css_metrics.c | 25 - + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 197 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.h | 17 +- + drivers/staging/media/atomisp/pci/sh_css_morph.c | 17 - + .../media/atomisp/pci/sh_css_param_shading.c | 82 +- + drivers/staging/media/atomisp/pci/sh_css_params.c | 249 +- + drivers/staging/media/atomisp/pci/sh_css_params.h | 8 - + drivers/staging/media/atomisp/pci/sh_css_shading.c | 17 - + drivers/staging/media/atomisp/pci/sh_css_sp.c | 131 +- + drivers/staging/media/atomisp/pci/sh_css_sp.h | 7 +- + drivers/staging/media/atomisp/pci/sh_css_stream.c | 17 - + drivers/staging/media/atomisp/pci/system_global.h | 3 - + drivers/staging/media/hantro/Kconfig | 11 +- + drivers/staging/media/hantro/Makefile | 10 +- + drivers/staging/media/hantro/hantro.h | 50 +- + drivers/staging/media/hantro/hantro_drv.c | 51 +- + drivers/staging/media/hantro/hantro_g2.c | 44 + + drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 92 +- + drivers/staging/media/hantro/hantro_g2_regs.h | 149 +- + drivers/staging/media/hantro/hantro_g2_vp9_dec.c | 1022 ++++++ + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 7 +- + drivers/staging/media/hantro/hantro_hevc.c | 79 +- + drivers/staging/media/hantro/hantro_hw.h | 131 +- + drivers/staging/media/hantro/hantro_jpeg.c | 31 +- + drivers/staging/media/hantro/hantro_jpeg.h | 4 +- + drivers/staging/media/hantro/hantro_postproc.c | 84 +- + drivers/staging/media/hantro/hantro_v4l2.c | 13 +- + drivers/staging/media/hantro/hantro_vp9.c | 240 ++ + drivers/staging/media/hantro/hantro_vp9.h | 102 + + drivers/staging/media/hantro/imx8m_vpu_hw.c | 58 +- + .../media/hantro/rockchip_vpu2_hw_jpeg_enc.c | 22 +- + drivers/staging/media/hantro/rockchip_vpu_hw.c | 12 +- + drivers/staging/media/hantro/sama5d4_vdec_hw.c | 3 +- + drivers/staging/media/hantro/sunxi_vpu_hw.c | 86 + + drivers/staging/media/imx/imx-media-csc-scaler.c | 2 +- + drivers/staging/media/imx/imx-media-csi.c | 2 +- + drivers/staging/media/imx/imx-media-utils.c | 42 - + drivers/staging/media/imx/imx-media.h | 4 - + drivers/staging/media/imx/imx6-mipi-csi2.c | 9 +- + .../staging/media/ipu3/include/uapi/intel-ipu3.h | 42 +- + drivers/staging/media/ipu3/ipu3-css-params.c | 3 - + drivers/staging/media/max96712/Kconfig | 14 + + drivers/staging/media/max96712/Makefile | 2 + + drivers/staging/media/max96712/max96712.c | 440 +++ + drivers/staging/media/meson/vdec/vdec_helpers.c | 10 +- + drivers/staging/media/rkvdec/Kconfig | 1 + + drivers/staging/media/rkvdec/Makefile | 2 +- + drivers/staging/media/rkvdec/rkvdec-vp9.c | 1072 ++++++ + drivers/staging/media/rkvdec/rkvdec.c | 43 +- + drivers/staging/media/rkvdec/rkvdec.h | 12 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 12 + + drivers/staging/media/tegra-vde/vde.c | 147 +- + drivers/staging/media/tegra-vde/vde.h | 18 + + include/media/cec.h | 11 +- + include/media/dmxdev.h | 1 - + include/media/dvb_frontend.h | 13 +- + include/media/rc-core.h | 2 - + include/media/v4l2-ctrls.h | 4 + + include/media/v4l2-mem2mem.h | 5 + + include/media/v4l2-vp9.h | 233 ++ + include/media/videobuf2-core.h | 9 +- + include/uapi/linux/v4l2-controls.h | 288 +- + include/uapi/linux/videodev2.h | 6 + + 359 files changed, 15063 insertions(+), 11181 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun50i-h6-vpu-g2.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/adv748x.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/adv748x.yaml + delete mode 100644 Documentation/devicetree/bindings/media/renesas,jpu.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,jpu.yaml + create mode 100644 Documentation/devicetree/bindings/media/st,stm32-dma2d.yaml + delete mode 100644 Documentation/userspace-api/media/rc/lirc-set-rec-timeout-reports.rst + create mode 100644 drivers/media/i2c/ov5693.c + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d-hw.c + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d-regs.h + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d.c + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d.h + create mode 100644 drivers/media/v4l2-core/v4l2-vp9.c + delete mode 100644 drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_configs.c + delete mode 100644 drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_params.c + delete mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_configs.c + delete mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_states.c + create mode 100644 drivers/staging/media/atomisp/pci/ia_css_isp_configs.c + rename drivers/staging/media/atomisp/pci/{css_2401_system/hive => }/ia_css_isp_params.c (99%) + rename drivers/staging/media/atomisp/pci/{css_2400_system/hive => }/ia_css_isp_states.c (100%) + delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_metadata.c + delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_morph.c + delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_shading.c + delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_stream.c + create mode 100644 drivers/staging/media/hantro/hantro_g2.c + create mode 100644 drivers/staging/media/hantro/hantro_g2_vp9_dec.c + create mode 100644 drivers/staging/media/hantro/hantro_vp9.c + create mode 100644 drivers/staging/media/hantro/hantro_vp9.h + create mode 100644 drivers/staging/media/hantro/sunxi_vpu_hw.c + create mode 100644 drivers/staging/media/max96712/Kconfig + create mode 100644 drivers/staging/media/max96712/Makefile + create mode 100644 drivers/staging/media/max96712/max96712.c + create mode 100644 drivers/staging/media/rkvdec/rkvdec-vp9.c + create mode 100644 include/media/v4l2-vp9.h +Merging v4l-dvb-next/master (68b9bcc8a534 media: ipu3-cio2: Add support for instantiating i2c-clients for VCMs) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (7a716cec17d1 Merge branches 'thermal' and 'thermal-int340x' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging init/Kconfig +Auto-merging include/acpi/acpi_bus.h +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/i2c/i2c-core-acpi.c +Auto-merging drivers/acpi/scan.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/acpi/cppc_sysfs.rst | 2 + + Documentation/admin-guide/kernel-parameters.txt | 15 +- + Documentation/admin-guide/pm/amd-pstate.rst | 382 ++++++++++++ + Documentation/admin-guide/pm/working-state.rst | 1 + + .../devicetree/bindings/thermal/rzg2l-thermal.yaml | 76 +++ + .../acpi/dsd/data-node-references.rst | 28 +- + Documentation/firmware-guide/acpi/dsd/graph.rst | 40 +- + Documentation/firmware-guide/acpi/dsd/leds.rst | 40 +- + Documentation/firmware-guide/acpi/dsd/phy.rst | 28 +- + Documentation/power/opp.rst | 14 +- + Documentation/power/runtime_pm.rst | 14 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 14 +- + arch/arm/include/asm/topology.h | 2 +- + arch/arm64/include/asm/topology.h | 2 +- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/msr-index.h | 17 + + arch/x86/kernel/acpi/sleep.c | 4 +- + drivers/acpi/Kconfig | 22 + + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_video.c | 5 +- + drivers/acpi/acpica/acevents.h | 5 + + drivers/acpi/acpica/acobject.h | 1 + + drivers/acpi/acpica/actables.h | 8 +- + drivers/acpi/acpica/dsopcode.c | 1 + + drivers/acpi/acpica/evhandler.c | 2 +- + drivers/acpi/acpica/evregion.c | 10 + + drivers/acpi/acpica/evrgnini.c | 52 ++ + drivers/acpi/acpica/exconfig.c | 2 +- + drivers/acpi/acpica/excreate.c | 1 + + drivers/acpi/acpica/exfield.c | 7 +- + drivers/acpi/acpica/exoparg1.c | 3 +- + drivers/acpi/acpica/exregion.c | 15 +- + drivers/acpi/acpica/hwesleep.c | 4 +- + drivers/acpi/acpica/hwsleep.c | 4 +- + drivers/acpi/acpica/hwxfsleep.c | 2 - + drivers/acpi/acpica/tbdata.c | 93 ++- + drivers/acpi/acpica/tbfadt.c | 6 +- + drivers/acpi/acpica/tbinstal.c | 15 +- + drivers/acpi/acpica/tbprint.c | 3 +- + drivers/acpi/acpica/tbutils.c | 2 +- + drivers/acpi/acpica/tbxfload.c | 52 +- + drivers/acpi/acpica/utdelete.c | 1 + + drivers/acpi/battery.c | 22 + + drivers/acpi/bus.c | 4 +- + drivers/acpi/cppc_acpi.c | 161 ++++-- + drivers/acpi/device_pm.c | 31 +- + drivers/acpi/device_sysfs.c | 3 +- + drivers/acpi/dock.c | 3 +- + drivers/acpi/dptf/dptf_pch_fivr.c | 2 +- + drivers/acpi/ec.c | 317 +++++----- + drivers/acpi/ec_sys.c | 2 +- + drivers/acpi/internal.h | 12 +- + drivers/acpi/numa/srat.c | 5 +- + drivers/acpi/pci_link.c | 12 +- + drivers/acpi/pci_root.c | 12 +- + drivers/acpi/pfr_telemetry.c | 434 ++++++++++++++ + drivers/acpi/pfr_update.c | 575 ++++++++++++++++++ + drivers/acpi/pmic/intel_pmic.c | 14 +- + drivers/acpi/pmic/intel_pmic.h | 8 +- + drivers/acpi/pmic/intel_pmic_bxtwc.c | 3 +- + drivers/acpi/pmic/intel_pmic_bytcrc.c | 3 +- + drivers/acpi/pmic/intel_pmic_chtcrc.c | 3 +- + drivers/acpi/pmic/intel_pmic_chtdc_ti.c | 3 +- + drivers/acpi/pmic/intel_pmic_chtwc.c | 3 +- + drivers/acpi/pmic/intel_pmic_xpower.c | 24 +- + drivers/acpi/power.c | 19 +- + drivers/acpi/processor_driver.c | 10 +- + drivers/acpi/processor_idle.c | 11 +- + drivers/acpi/processor_thermal.c | 13 +- + drivers/acpi/property.c | 11 +- + drivers/acpi/resource.c | 4 +- + drivers/acpi/scan.c | 57 +- + drivers/acpi/sleep.c | 31 +- + drivers/acpi/sysfs.c | 3 +- + drivers/acpi/tables.c | 6 +- + drivers/acpi/thermal.c | 11 +- + drivers/acpi/video_detect.c | 6 +- + drivers/acpi/x86/s2idle.c | 4 +- + drivers/acpi/x86/utils.c | 233 ++++++-- + drivers/base/arch_topology.c | 42 +- + drivers/base/core.c | 4 +- + drivers/base/power/runtime.c | 98 ++-- + drivers/base/property.c | 137 ++--- + drivers/base/swnode.c | 2 +- + drivers/cpufreq/Kconfig.x86 | 17 + + drivers/cpufreq/Makefile | 5 + + drivers/cpufreq/amd-pstate-trace.c | 2 + + drivers/cpufreq/amd-pstate-trace.h | 77 +++ + drivers/cpufreq/amd-pstate.c | 643 +++++++++++++++++++++ + drivers/cpufreq/cpufreq.c | 9 +- + drivers/cpufreq/cpufreq_conservative.c | 5 +- + drivers/cpufreq/cpufreq_ondemand.c | 5 +- + drivers/cpufreq/intel_pstate.c | 121 ++-- + drivers/cpufreq/mediatek-cpufreq-hw.c | 33 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 39 +- + drivers/cpuidle/governors/menu.c | 2 +- + drivers/cpuidle/sysfs.c | 2 +- + drivers/devfreq/Kconfig | 9 + + drivers/devfreq/Makefile | 1 + + drivers/devfreq/devfreq.c | 4 +- + drivers/devfreq/sun8i-a33-mbus.c | 511 ++++++++++++++++ + drivers/i2c/i2c-core-acpi.c | 7 + + drivers/mmc/host/jz4740_mmc.c | 8 +- + drivers/mmc/host/mxcmmc.c | 6 +- + drivers/mmc/host/sdhci-acpi.c | 78 +-- + drivers/net/ethernet/realtek/r8169_main.c | 4 +- + drivers/pci/quirks.c | 2 +- + drivers/powercap/dtpm.c | 6 +- + drivers/powercap/idle_inject.c | 2 +- + drivers/powercap/intel_rapl_common.c | 61 +- + drivers/staging/media/tegra-video/vi.c | 12 +- + drivers/thermal/Kconfig | 9 + + drivers/thermal/Makefile | 1 + + drivers/thermal/cpufreq_cooling.c | 6 +- + drivers/thermal/imx8mm_thermal.c | 3 + + drivers/thermal/imx_thermal.c | 145 +++-- + .../intel/int340x_thermal/acpi_thermal_rel.c | 5 +- + .../intel/int340x_thermal/acpi_thermal_rel.h | 48 +- + .../int340x_thermal/processor_thermal_device.h | 3 +- + .../intel/int340x_thermal/processor_thermal_mbox.c | 100 ++-- + .../intel/int340x_thermal/processor_thermal_rfim.c | 23 +- + drivers/thermal/intel/intel_powerclamp.c | 2 +- + drivers/thermal/rzg2l_thermal.c | 242 ++++++++ + drivers/tty/serdev/core.c | 14 + + include/acpi/acpi_bus.h | 22 +- + include/acpi/acpi_numa.h | 1 - + include/acpi/acpixf.h | 8 +- + include/acpi/actbl2.h | 116 +++- + include/acpi/actypes.h | 23 +- + include/acpi/cppc_acpi.h | 5 + + include/acpi/processor.h | 7 +- + include/linux/acpi.h | 2 +- + include/linux/arch_topology.h | 4 +- + include/linux/dtpm.h | 2 - + include/linux/efi.h | 46 ++ + include/linux/intel_rapl.h | 6 + + include/linux/pm.h | 82 ++- + include/linux/pm_runtime.h | 3 + + include/linux/property.h | 12 +- + include/linux/sched/topology.h | 6 +- + include/linux/suspend.h | 1 + + include/uapi/linux/pfrut.h | 262 +++++++++ + init/Kconfig | 2 +- + kernel/power/power.h | 1 + + kernel/power/swap.c | 16 +- + tools/power/acpi/.gitignore | 1 + + tools/power/acpi/Makefile | 16 +- + tools/power/acpi/Makefile.rules | 2 +- + tools/power/acpi/man/pfrut.8 | 137 +++++ + tools/power/acpi/tools/pfrut/Makefile | 23 + + tools/power/acpi/tools/pfrut/pfrut.c | 424 ++++++++++++++ + tools/thermal/tmon/pid.c | 3 +- + 153 files changed, 5814 insertions(+), 1047 deletions(-) + create mode 100644 Documentation/admin-guide/pm/amd-pstate.rst + create mode 100644 Documentation/devicetree/bindings/thermal/rzg2l-thermal.yaml + create mode 100644 drivers/acpi/pfr_telemetry.c + create mode 100644 drivers/acpi/pfr_update.c + create mode 100644 drivers/cpufreq/amd-pstate-trace.c + create mode 100644 drivers/cpufreq/amd-pstate-trace.h + create mode 100644 drivers/cpufreq/amd-pstate.c + create mode 100644 drivers/devfreq/sun8i-a33-mbus.c + create mode 100644 drivers/thermal/rzg2l_thermal.c + create mode 100644 include/uapi/linux/pfrut.h + create mode 100644 tools/power/acpi/man/pfrut.8 + create mode 100644 tools/power/acpi/tools/pfrut/Makefile + create mode 100644 tools/power/acpi/tools/pfrut/pfrut.c +Merging cpufreq-arm/cpufreq/arm/linux-next (d776790a5536 cpufreq: mediatek-hw: Fix double devm_remap in hotplug case) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (e173bc6e950a tools: cpupower: fix typo in cpupower-idle-set(1) manpage) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/man/cpupower-idle-set.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devfreq/devfreq-next (4667431419e9 PM / devfreq: Reduce log severity for informative message) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (489a00ef46c9 Documentation: power: Update outdated contents in opp.rst) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (8ee1c0f6526c thermal/drivers/rz2gl: Add error check for reset_control_deassert()) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (feae43f8aa88 fs: dlm: print cluster addr if non-cluster node connects) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/ast.c | 16 ++- + fs/dlm/debug_fs.c | 96 ++++++++++++++++- + fs/dlm/dir.c | 3 +- + fs/dlm/dlm_internal.h | 12 +-- + fs/dlm/lock.c | 109 +++++++++++++++++-- + fs/dlm/lock.h | 4 + + fs/dlm/lockspace.c | 38 ++++--- + fs/dlm/lowcomms.c | 209 +++++++++++++++++++----------------- + fs/dlm/lowcomms.h | 6 +- + fs/dlm/main.c | 3 + + fs/dlm/member.c | 3 +- + fs/dlm/memory.c | 68 +++++++++++- + fs/dlm/memory.h | 6 ++ + fs/dlm/midcomms.c | 85 ++++++++++++--- + fs/dlm/midcomms.h | 3 + + fs/dlm/rcom.c | 2 +- + fs/dlm/recoverd.c | 3 +- + fs/dlm/requestqueue.c | 17 ++- + include/trace/events/dlm.h | 260 +++++++++++++++++++++++++++++++++++++++++++++ + 19 files changed, 770 insertions(+), 173 deletions(-) + create mode 100644 include/trace/events/dlm.h +Merging rdma/for-next (c8f476da84ad Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.h +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cache.c | 12 +- + drivers/infiniband/core/cma.c | 18 ++- + drivers/infiniband/core/device.c | 3 +- + drivers/infiniband/core/umem_odp.c | 3 +- + drivers/infiniband/core/uverbs_cmd.c | 1 - + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 9 +- + drivers/infiniband/hw/bnxt_re/main.c | 3 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 11 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 12 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 1 - + drivers/infiniband/hw/bnxt_re/qplib_res.c | 50 ------ + drivers/infiniband/hw/bnxt_re/qplib_res.h | 7 - + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 99 +----------- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 9 -- + drivers/infiniband/hw/cxgb4/cm.c | 5 +- + drivers/infiniband/hw/cxgb4/id_table.c | 17 +- + drivers/infiniband/hw/cxgb4/provider.c | 8 +- + drivers/infiniband/hw/hfi1/user_sdma.c | 8 +- + drivers/infiniband/hw/hns/hns_roce_cmd.c | 10 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 48 +++--- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 20 ++- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 18 +-- + drivers/infiniband/hw/hns/hns_roce_main.c | 39 ++++- + drivers/infiniband/hw/hns/hns_roce_mr.c | 10 +- + drivers/infiniband/hw/hns/hns_roce_pd.c | 3 + + drivers/infiniband/hw/hns/hns_roce_qp.c | 56 ++++++- + drivers/infiniband/hw/irdma/pble.h | 2 +- + drivers/infiniband/hw/irdma/verbs.c | 27 +--- + drivers/infiniband/hw/mlx4/main.c | 10 +- + drivers/infiniband/hw/mlx5/fs.c | 18 +-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 7 +- + drivers/infiniband/hw/mthca/mthca_allocator.c | 15 +- + drivers/infiniband/hw/mthca/mthca_mr.c | 25 ++- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 16 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 17 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 10 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 1 - + drivers/infiniband/hw/qedr/verbs.c | 2 + + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 8 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_doorbell.c | 10 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 8 +- + drivers/infiniband/sw/rxe/rxe_cq.c | 24 ++- + drivers/infiniband/sw/rxe/rxe_loc.h | 10 +- + drivers/infiniband/sw/rxe/rxe_mcast.c | 11 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 6 +- + drivers/infiniband/sw/rxe/rxe_mw.c | 21 ++- + drivers/infiniband/sw/rxe/rxe_pool.c | 177 ++++++++++----------- + drivers/infiniband/sw/rxe/rxe_pool.h | 54 +++---- + drivers/infiniband/sw/rxe/rxe_qp.c | 6 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 9 +- + drivers/infiniband/sw/rxe/rxe_req.c | 16 +- + drivers/infiniband/sw/rxe/rxe_srq.c | 2 +- + drivers/infiniband/sw/rxe/rxe_task.c | 18 +-- + drivers/infiniband/sw/rxe/rxe_verbs.c | 29 ++-- + drivers/infiniband/sw/rxe/rxe_verbs.h | 22 +-- + drivers/infiniband/sw/siw/siw_verbs.c | 6 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 76 +++++++-- + include/linux/mlx5/fs.h | 1 + + include/uapi/rdma/hns-abi.h | 2 + + 62 files changed, 517 insertions(+), 637 deletions(-) +Merging net-next/master (18343b806915 Merge tag 'mac80211-next-for-net-next-2022-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Removing tools/testing/selftests/bpf/test_stub.c +Auto-merging tools/perf/util/bpf-loader.c +Auto-merging tools/perf/builtin-trace.c +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/xdp/xsk.c +Auto-merging net/sctp/socket.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/ipv6/udp.c +Auto-merging net/ipv6/seg6_local.c +Auto-merging net/ipv6/route.c +Auto-merging net/ipv6/ip6_gre.c +Auto-merging net/ipv4/fib_semantics.c +Auto-merging include/net/xfrm.h +Auto-merging include/net/sctp/sctp.h +Auto-merging include/linux/perf_event.h +Auto-merging fs/nfs/dir.c +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Removing drivers/net/ethernet/intel/ice/ice_status.h +Removing drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c +Removing drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile +Removing drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c +Removing drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile +Auto-merging drivers/net/ethernet/amazon/ena/ena_netdev.c +Auto-merging drivers/infiniband/core/cache.c +Auto-merging arch/powerpc/net/bpf_jit_comp64.c +Auto-merging arch/powerpc/net/bpf_jit_comp32.c +Auto-merging arch/arm/boot/dts/sun8i-r40.dtsi +Auto-merging arch/arm/boot/dts/qcom-sdx55.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/bpf/btf.rst | 57 +- + Documentation/bpf/classic_vs_extended.rst | 376 + + Documentation/bpf/faq.rst | 11 + + Documentation/bpf/helpers.rst | 7 + + Documentation/bpf/index.rst | 103 +- + Documentation/bpf/instruction-set.rst | 253 + + Documentation/bpf/libbpf/index.rst | 4 +- + Documentation/bpf/maps.rst | 52 + + Documentation/bpf/other.rst | 9 + + Documentation/bpf/{bpf_lsm.rst => prog_lsm.rst} | 0 + Documentation/bpf/programs.rst | 9 + + Documentation/bpf/syscall_api.rst | 11 + + Documentation/bpf/test_debug.rst | 9 + + Documentation/bpf/verifier.rst | 529 + + .../intel,ixp4xx-network-processing-engine.yaml | 35 + + .../bindings/net/can/allwinner,sun4i-a10-can.yaml | 24 + + .../devicetree/bindings/net/dsa/dsa-port.yaml | 77 + + Documentation/devicetree/bindings/net/dsa/dsa.yaml | 60 +- + .../devicetree/bindings/net/dsa/qca8k.yaml | 40 +- + .../devicetree/bindings/net/engleder,tsnep.yaml | 79 + + .../devicetree/bindings/net/intel,ixp4xx-hss.yaml | 100 + + .../bindings/net/microchip,lan966x-switch.yaml | 169 + + .../devicetree/bindings/net/qcom,bam-dmux.yaml | 92 + + .../devicetree/bindings/net/vertexcom-mse102x.yaml | 71 + + .../bindings/net/wireless/microchip,wilc1000.yaml | 19 + + .../bindings/net/wireless/qcom,ath11k.yaml | 30 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/networking/bonding.rst | 11 + + .../networking/devlink/devlink-params.rst | 15 +- + Documentation/networking/devlink/ice.rst | 24 +- + Documentation/networking/devlink/mlx5.rst | 10 + + Documentation/networking/ethtool-netlink.rst | 10 +- + Documentation/networking/filter.rst | 1036 +- + Documentation/networking/net_failover.rst | 111 +- + Documentation/networking/phy.rst | 5 + + MAINTAINERS | 17 +- + arch/arm/boot/dts/qcom-sdx55.dtsi | 6 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 19 + + arch/arm/net/bpf_jit_32.c | 7 +- + arch/arm64/include/asm/extable.h | 9 - + arch/arm64/include/asm/memory.h | 5 +- + arch/arm64/kernel/traps.c | 2 +- + arch/arm64/mm/ptdump.c | 2 - + arch/arm64/net/bpf_jit_comp.c | 14 +- + arch/mips/net/bpf_jit_comp32.c | 3 +- + arch/mips/net/bpf_jit_comp64.c | 2 +- + arch/powerpc/net/bpf_jit_comp32.c | 4 +- + arch/powerpc/net/bpf_jit_comp64.c | 4 +- + arch/riscv/net/bpf_jit_comp32.c | 6 +- + arch/riscv/net/bpf_jit_comp64.c | 7 +- + arch/s390/mm/hugetlbpage.c | 1 + + arch/s390/net/bpf_jit_comp.c | 6 +- + arch/sparc/net/bpf_jit_comp_64.c | 4 +- + arch/um/drivers/vector_kern.c | 4 +- + arch/x86/net/bpf_jit_comp.c | 69 +- + arch/x86/net/bpf_jit_comp32.c | 4 +- + drivers/base/regmap/regmap.c | 1 + + drivers/bluetooth/Kconfig | 6 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/bfusb.c | 3 + + drivers/bluetooth/btbcm.c | 39 + + drivers/bluetooth/btintel.c | 48 +- + drivers/bluetooth/btmrvl_main.c | 2 +- + drivers/bluetooth/btmtk.c | 290 + + drivers/bluetooth/btmtk.h | 111 + + drivers/bluetooth/btmtksdio.c | 535 +- + drivers/bluetooth/btqca.c | 1 + + drivers/bluetooth/btsdio.c | 2 + + drivers/bluetooth/btusb.c | 572 +- + drivers/bluetooth/hci_bcm.c | 1 - + drivers/bluetooth/hci_h4.c | 4 +- + drivers/bluetooth/hci_qca.c | 3 + + drivers/bluetooth/hci_vhci.c | 122 +- + drivers/bluetooth/virtio_bt.c | 3 + + drivers/infiniband/core/cache.c | 1 + + drivers/infiniband/hw/irdma/ctrl.c | 2 + + drivers/infiniband/hw/irdma/main.c | 3 +- + drivers/infiniband/hw/irdma/uda.c | 2 + + drivers/infiniband/hw/mlx5/doorbell.c | 1 + + drivers/infiniband/hw/mlx5/qp.c | 1 + + drivers/isdn/capi/kcapi.c | 2 +- + drivers/misc/mei/bus.c | 67 +- + drivers/misc/mei/client.c | 3 + + drivers/misc/mei/hw.h | 5 + + drivers/net/amt.c | 1 + + drivers/net/appletalk/ipddp.c | 1 + + drivers/net/bareudp.c | 54 +- + drivers/net/bonding/bond_main.c | 100 +- + drivers/net/bonding/bond_netlink.c | 15 + + drivers/net/bonding/bond_options.c | 28 + + drivers/net/bonding/bond_procfs.c | 2 + + drivers/net/bonding/bond_sysfs.c | 13 + + drivers/net/can/c_can/c_can_ethtool.c | 4 +- + drivers/net/can/dev/bittiming.c | 5 +- + drivers/net/can/spi/hi311x.c | 52 +- + drivers/net/can/sun4i_can.c | 62 +- + drivers/net/can/usb/etas_es58x/es581_4.c | 5 +- + drivers/net/can/usb/etas_es58x/es58x_fd.c | 5 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 1 + + drivers/net/dsa/b53/b53_common.c | 9 +- + drivers/net/dsa/b53/b53_priv.h | 5 +- + drivers/net/dsa/bcm_sf2.c | 54 +- + drivers/net/dsa/bcm_sf2.h | 10 + + drivers/net/dsa/bcm_sf2_regs.h | 65 +- + drivers/net/dsa/dsa_loop.c | 9 +- + drivers/net/dsa/hirschmann/hellcreek.c | 116 +- + drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c | 4 - + drivers/net/dsa/lan9303-core.c | 7 +- + drivers/net/dsa/lantiq_gswip.c | 145 +- + drivers/net/dsa/microchip/ksz8795.c | 1 + + drivers/net/dsa/microchip/ksz_common.c | 10 +- + drivers/net/dsa/microchip/ksz_common.h | 4 +- + drivers/net/dsa/mt7530.c | 58 +- + drivers/net/dsa/mv88e6xxx/chip.c | 146 +- + drivers/net/dsa/mv88e6xxx/hwtstamp.c | 4 - + drivers/net/dsa/ocelot/Kconfig | 1 + + drivers/net/dsa/ocelot/felix.c | 97 +- + drivers/net/dsa/ocelot/felix.h | 10 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 929 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 140 +- + drivers/net/dsa/qca8k.c | 666 +- + drivers/net/dsa/qca8k.h | 198 +- + drivers/net/dsa/realtek-smi-core.c | 2 +- + drivers/net/dsa/rtl8365mb.c | 20 +- + drivers/net/dsa/rtl8366rb.c | 9 +- + drivers/net/dsa/sja1105/sja1105.h | 6 +- + drivers/net/dsa/sja1105/sja1105_flower.c | 2 +- + drivers/net/dsa/sja1105/sja1105_main.c | 163 +- + drivers/net/dsa/sja1105/sja1105_ptp.c | 86 +- + drivers/net/dsa/sja1105/sja1105_ptp.h | 24 + + drivers/net/dsa/vitesse-vsc73xx-core.c | 7 +- + drivers/net/dsa/vitesse-vsc73xx.h | 2 +- + drivers/net/dsa/xrs700x/xrs700x.c | 11 +- + drivers/net/eql.c | 4 +- + drivers/net/ethernet/3com/typhoon.c | 4 +- + drivers/net/ethernet/8390/hydra.c | 4 +- + drivers/net/ethernet/8390/mac8390.c | 4 +- + drivers/net/ethernet/8390/smc-ultra.c | 4 +- + drivers/net/ethernet/8390/wd.c | 4 +- + drivers/net/ethernet/Kconfig | 2 + + drivers/net/ethernet/Makefile | 2 + + drivers/net/ethernet/allwinner/sun4i-emac.c | 218 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 8 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 1 + + drivers/net/ethernet/amd/a2065.c | 18 +- + drivers/net/ethernet/amd/ariadne.c | 20 +- + drivers/net/ethernet/amd/atarilance.c | 7 +- + drivers/net/ethernet/amd/hplance.c | 4 +- + drivers/net/ethernet/amd/lance.c | 4 +- + drivers/net/ethernet/amd/mvme147.c | 14 +- + drivers/net/ethernet/amd/ni65.c | 8 +- + drivers/net/ethernet/amd/pcnet32.c | 8 +- + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 6 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 3 - + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 11 +- + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 11 +- + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 8 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- + drivers/net/ethernet/apple/macmace.c | 14 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 8 +- + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 3 - + drivers/net/ethernet/asix/ax88796c_main.c | 18 +- + drivers/net/ethernet/atheros/ag71xx.c | 111 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 8 +- + drivers/net/ethernet/broadcom/b44.c | 8 +- + drivers/net/ethernet/broadcom/bcm4908_enet.c | 2 - + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 25 +- + drivers/net/ethernet/broadcom/bnx2.c | 8 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 11 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 7 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 8 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 2 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 80 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 13 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 7 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 14 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 73 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 32 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 3 - + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 13 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 30 +- + drivers/net/ethernet/cadence/macb_main.c | 107 +- + drivers/net/ethernet/cadence/macb_ptp.c | 4 - + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 11 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 3 - + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 3 - + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 5 +- + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 8 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 6 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 1 + + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 27 +- + drivers/net/ethernet/chelsio/cxgb/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 8 +- + drivers/net/ethernet/chelsio/cxgb3/sge.c | 13 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 19 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 8 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 10 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 8 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 7 +- + drivers/net/ethernet/cirrus/mac89x0.c | 7 +- + drivers/net/ethernet/cisco/enic/enic.h | 2 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 8 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 16 +- + drivers/net/ethernet/cortina/gemini.c | 8 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 4 +- + drivers/net/ethernet/engleder/Kconfig | 39 + + drivers/net/ethernet/engleder/Makefile | 10 + + drivers/net/ethernet/engleder/tsnep.h | 189 + + drivers/net/ethernet/engleder/tsnep_ethtool.c | 293 + + drivers/net/ethernet/engleder/tsnep_hw.h | 230 + + drivers/net/ethernet/engleder/tsnep_main.c | 1272 ++ + drivers/net/ethernet/engleder/tsnep_ptp.c | 218 + + drivers/net/ethernet/engleder/tsnep_selftests.c | 811 ++ + drivers/net/ethernet/engleder/tsnep_tc.c | 443 + + drivers/net/ethernet/ethoc.c | 17 +- + drivers/net/ethernet/faraday/ftgmac100.c | 14 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 6 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 122 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 3 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 4 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 81 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.h | 4 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 6 +- + drivers/net/ethernet/freescale/fec_main.c | 48 +- + drivers/net/ethernet/freescale/fec_ptp.c | 4 - + drivers/net/ethernet/freescale/fman/fman.c | 32 +- + drivers/net/ethernet/freescale/gianfar.c | 4 - + drivers/net/ethernet/freescale/gianfar_ethtool.c | 8 +- + drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 8 +- + drivers/net/ethernet/google/gve/gve.h | 21 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 2 +- + drivers/net/ethernet/google/gve/gve_desc.h | 20 + + drivers/net/ethernet/google/gve/gve_dqo.h | 24 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 86 +- + drivers/net/ethernet/google/gve/gve_main.c | 111 +- + drivers/net/ethernet/google/gve/gve_rx.c | 2 - + drivers/net/ethernet/google/gve/gve_tx.c | 73 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 6 +- + drivers/net/ethernet/hisilicon/hns3/Makefile | 18 +- + drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 3 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 14 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 626 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 227 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h | 2 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 904 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 17 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 116 +- + .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 12 - + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 591 - + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 162 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 116 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h | 13 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 25 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 788 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 30 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 26 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 4 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h | 4 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 2 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h | 3 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 108 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 6 + + .../net/ethernet/hisilicon/hns3/hns3vf/Makefile | 10 - + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 556 - + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 151 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 194 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 30 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 23 +- + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 40 +- + .../net/ethernet/huawei/hinic/hinic_hw_api_cmd.c | 5 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 10 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 5 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c | 9 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_io.c | 17 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c | 23 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 10 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 10 +- + drivers/net/ethernet/i825xx/82596.c | 3 +- + drivers/net/ethernet/i825xx/lasi_82596.c | 6 +- + drivers/net/ethernet/ibm/emac/core.c | 7 +- + drivers/net/ethernet/ibm/ibmvnic.c | 74 +- + drivers/net/ethernet/ibm/ibmvnic.h | 2 - + drivers/net/ethernet/intel/Kconfig | 10 + + drivers/net/ethernet/intel/e100.c | 8 +- + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 8 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 14 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 8 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 4 - + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 8 +- + drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 4 - + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.h | 1 - + drivers/net/ethernet/intel/iavf/iavf.h | 115 +- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 60 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 796 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 75 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.h | 30 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 558 +- + drivers/net/ethernet/intel/ice/ice.h | 11 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 7 + + drivers/net/ethernet/intel/ice/ice_base.c | 22 +- + drivers/net/ethernet/intel/ice/ice_cgu_regs.h | 116 + + drivers/net/ethernet/intel/ice/ice_common.c | 427 +- + drivers/net/ethernet/intel/ice/ice_common.h | 96 +- + drivers/net/ethernet/intel/ice/ice_controlq.c | 120 +- + drivers/net/ethernet/intel/ice/ice_dcb.c | 92 +- + drivers/net/ethernet/intel/ice/ice_dcb.h | 27 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 2 +- + drivers/net/ethernet/intel/ice/ice_devlink.c | 398 +- + drivers/net/ethernet/intel/ice/ice_devlink.h | 2 + + drivers/net/ethernet/intel/ice/ice_ethtool.c | 157 +- + drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 304 +- + drivers/net/ethernet/intel/ice/ice_fdir.c | 20 +- + drivers/net/ethernet/intel/ice/ice_fdir.h | 13 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 696 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.h | 83 +- + drivers/net/ethernet/intel/ice/ice_flex_type.h | 42 + + drivers/net/ethernet/intel/ice/ice_flow.c | 214 +- + drivers/net/ethernet/intel/ice/ice_flow.h | 22 +- + drivers/net/ethernet/intel/ice/ice_fltr.c | 144 +- + drivers/net/ethernet/intel/ice/ice_fltr.h | 40 +- + drivers/net/ethernet/intel/ice/ice_fw_update.c | 397 +- + drivers/net/ethernet/intel/ice/ice_fw_update.h | 9 +- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 9 + + drivers/net/ethernet/intel/ice/ice_idc.c | 4 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 302 +- + drivers/net/ethernet/intel/ice/ice_lib.h | 6 +- + drivers/net/ethernet/intel/ice/ice_main.c | 715 +- + drivers/net/ethernet/intel/ice/ice_nvm.c | 208 +- + drivers/net/ethernet/intel/ice/ice_nvm.h | 36 +- + drivers/net/ethernet/intel/ice/ice_ptp.c | 858 +- + drivers/net/ethernet/intel/ice/ice_ptp.h | 38 +- + drivers/net/ethernet/intel/ice/ice_ptp_consts.h | 374 + + drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 2814 ++++- + drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 345 + + drivers/net/ethernet/intel/ice/ice_sched.c | 402 +- + drivers/net/ethernet/intel/ice/ice_sched.h | 37 +- + drivers/net/ethernet/intel/ice/ice_sriov.c | 40 +- + drivers/net/ethernet/intel/ice/ice_sriov.h | 12 +- + drivers/net/ethernet/intel/ice/ice_status.h | 44 - + drivers/net/ethernet/intel/ice/ice_switch.c | 463 +- + drivers/net/ethernet/intel/ice/ice_switch.h | 56 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 12 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 44 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 2 + + drivers/net/ethernet/intel/ice/ice_type.h | 36 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 298 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 457 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 2 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 2 +- + drivers/net/ethernet/intel/igb/e1000_i210.c | 3 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 8 +- + drivers/net/ethernet/intel/igb/igb_main.c | 156 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 192 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 8 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 7 - + drivers/net/ethernet/intel/igc/igc_ethtool.c | 14 +- + drivers/net/ethernet/intel/igc/igc_hw.h | 3 - + drivers/net/ethernet/intel/igc/igc_i225.c | 2 - + drivers/net/ethernet/intel/igc/igc_main.c | 39 +- + drivers/net/ethernet/intel/igc/igc_ptp.c | 4 - + drivers/net/ethernet/intel/igc/igc_xdp.c | 1 + + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 4 - + .../net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 2 - + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 2 +- + drivers/net/ethernet/intel/ixgbevf/defines.h | 4 + + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 8 +- + drivers/net/ethernet/intel/ixgbevf/ipsec.c | 11 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 5 + + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 15 +- + drivers/net/ethernet/intel/ixgbevf/mbx.c | 323 +- + drivers/net/ethernet/intel/ixgbevf/mbx.h | 19 +- + drivers/net/ethernet/intel/ixgbevf/vf.c | 62 +- + drivers/net/ethernet/intel/ixgbevf/vf.h | 5 +- + drivers/net/ethernet/lantiq_etop.c | 55 +- + drivers/net/ethernet/lantiq_xrx200.c | 47 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 10 +- + drivers/net/ethernet/marvell/mvneta.c | 432 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 3 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 229 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 8 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 6 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 2 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +- + drivers/net/ethernet/marvell/prestera/Makefile | 3 +- + drivers/net/ethernet/marvell/prestera/prestera.h | 39 + + .../net/ethernet/marvell/prestera/prestera_acl.c | 727 +- + .../net/ethernet/marvell/prestera/prestera_acl.h | 215 +- + .../ethernet/marvell/prestera/prestera_counter.c | 475 + + .../ethernet/marvell/prestera/prestera_counter.h | 30 + + .../net/ethernet/marvell/prestera/prestera_flow.c | 108 +- + .../net/ethernet/marvell/prestera/prestera_flow.h | 18 + + .../ethernet/marvell/prestera/prestera_flower.c | 353 +- + .../ethernet/marvell/prestera/prestera_flower.h | 8 +- + .../net/ethernet/marvell/prestera/prestera_hw.c | 630 +- + .../net/ethernet/marvell/prestera/prestera_hw.h | 73 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 16 +- + .../ethernet/marvell/prestera/prestera_router.c | 182 + + .../ethernet/marvell/prestera/prestera_router_hw.c | 208 + + .../ethernet/marvell/prestera/prestera_router_hw.h | 36 + + .../net/ethernet/marvell/prestera/prestera_span.c | 1 + + drivers/net/ethernet/marvell/pxa168_eth.c | 9 +- + drivers/net/ethernet/marvell/skge.c | 8 +- + drivers/net/ethernet/marvell/sky2.c | 92 +- + drivers/net/ethernet/mediatek/Kconfig | 3 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 116 +- + drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c | 3 - + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 5 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 88 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 36 +- + .../ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/mod_hdr.c | 58 + + .../net/ethernet/mellanox/mlx5/core/en/mod_hdr.h | 26 + + .../net/ethernet/mellanox/mlx5/core/en/params.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 1 + + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 3 + + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/rx_res.c | 14 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/accept.c | 31 + + .../ethernet/mellanox/mlx5/core/en/tc/act/act.c | 103 + + .../ethernet/mellanox/mlx5/core/en/tc/act/act.h | 75 + + .../ethernet/mellanox/mlx5/core/en/tc/act/csum.c | 61 + + .../net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c | 50 + + .../ethernet/mellanox/mlx5/core/en/tc/act/drop.c | 30 + + .../ethernet/mellanox/mlx5/core/en/tc/act/goto.c | 122 + + .../ethernet/mellanox/mlx5/core/en/tc/act/mark.c | 35 + + .../ethernet/mellanox/mlx5/core/en/tc/act/mirred.c | 315 + + .../mellanox/mlx5/core/en/tc/act/mirred_nic.c | 51 + + .../ethernet/mellanox/mlx5/core/en/tc/act/mpls.c | 86 + + .../ethernet/mellanox/mlx5/core/en/tc/act/pedit.c | 165 + + .../ethernet/mellanox/mlx5/core/en/tc/act/pedit.h | 32 + + .../ethernet/mellanox/mlx5/core/en/tc/act/ptype.c | 35 + + .../mlx5/core/en/tc/act/redirect_ingress.c | 79 + + .../ethernet/mellanox/mlx5/core/en/tc/act/sample.c | 51 + + .../ethernet/mellanox/mlx5/core/en/tc/act/trap.c | 38 + + .../ethernet/mellanox/mlx5/core/en/tc/act/tun.c | 61 + + .../ethernet/mellanox/mlx5/core/en/tc/act/vlan.c | 218 + + .../ethernet/mellanox/mlx5/core/en/tc/act/vlan.h | 30 + + .../mellanox/mlx5/core/en/tc/act/vlan_mangle.c | 87 + + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 90 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 12 + + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 23 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 3 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 59 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 168 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 35 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1234 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 6 - + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 34 +- + .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/esw/legacy.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 221 +- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 94 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 14 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 59 + + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 74 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 5 + + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 12 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 15 +- + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/main.c | 72 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/sf/hw_table.c | 2 +- + .../mellanox/mlx5/core/steering/dr_action.c | 23 +- + .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 29 +- + .../ethernet/mellanox/mlx5/core/steering/dr_dbg.c | 649 + + .../ethernet/mellanox/mlx5/core/steering/dr_dbg.h | 15 + + .../mellanox/mlx5/core/steering/dr_domain.c | 5 +- + .../mellanox/mlx5/core/steering/dr_matcher.c | 250 +- + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 47 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 61 + + .../ethernet/mellanox/mlx5/core/steering/dr_ste.h | 2 + + .../mellanox/mlx5/core/steering/dr_ste_v0.c | 25 +- + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 52 +- + .../mellanox/mlx5/core/steering/dr_table.c | 94 +- + .../mellanox/mlx5/core/steering/dr_types.h | 262 +- + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 18 +- + .../mellanox/mlx5/core/steering/mlx5_ifc_dr.h | 16 + + .../mellanox/mlxbf_gige/mlxbf_gige_ethtool.c | 7 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 239 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 44 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 22 +- + .../mellanox/mlxsw/core_acl_flex_actions.h | 16 +- + drivers/net/ethernet/mellanox/mlxsw/item.h | 36 + + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 10 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 1 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 641 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 209 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 38 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 2 +- + .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 14 +- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 58 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 30 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 5 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 28 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 165 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h | 2 + + .../ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c | 97 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 12 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h | 16 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 19 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 20 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 187 +- + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 24 +- + drivers/net/ethernet/micrel/ksz884x.c | 6 +- + drivers/net/ethernet/microchip/Kconfig | 1 + + drivers/net/ethernet/microchip/Makefile | 1 + + drivers/net/ethernet/microchip/lan743x_ptp.c | 6 - + drivers/net/ethernet/microchip/lan966x/Kconfig | 9 + + drivers/net/ethernet/microchip/lan966x/Makefile | 10 + + .../ethernet/microchip/lan966x/lan966x_ethtool.c | 682 ++ + .../net/ethernet/microchip/lan966x/lan966x_fdb.c | 244 + + .../net/ethernet/microchip/lan966x/lan966x_ifh.h | 173 + + .../net/ethernet/microchip/lan966x/lan966x_mac.c | 443 + + .../net/ethernet/microchip/lan966x/lan966x_main.c | 1000 ++ + .../net/ethernet/microchip/lan966x/lan966x_main.h | 256 + + .../ethernet/microchip/lan966x/lan966x_phylink.c | 127 + + .../net/ethernet/microchip/lan966x/lan966x_port.c | 406 + + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 865 ++ + .../ethernet/microchip/lan966x/lan966x_switchdev.c | 536 + + .../net/ethernet/microchip/lan966x/lan966x_vlan.c | 312 + + .../net/ethernet/microchip/sparx5/sparx5_main.c | 27 + + .../net/ethernet/microchip/sparx5/sparx5_phylink.c | 75 +- + drivers/net/ethernet/microsoft/mana/Makefile | 2 +- + drivers/net/ethernet/microsoft/mana/mana.h | 15 + + drivers/net/ethernet/microsoft/mana/mana_bpf.c | 162 + + drivers/net/ethernet/microsoft/mana/mana_en.c | 140 +- + drivers/net/ethernet/mscc/Makefile | 4 +- + drivers/net/ethernet/mscc/ocelot.c | 236 +- + drivers/net/ethernet/mscc/ocelot.h | 15 +- + drivers/net/ethernet/mscc/ocelot_fdma.c | 894 ++ + drivers/net/ethernet/mscc/ocelot_fdma.h | 166 + + drivers/net/ethernet/mscc/ocelot_flower.c | 84 +- + drivers/net/ethernet/mscc/ocelot_net.c | 85 +- + drivers/net/ethernet/mscc/ocelot_vcap.c | 103 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 535 +- + drivers/net/ethernet/mscc/vsc7514_regs.c | 523 + + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 4 +- + drivers/net/ethernet/natsemi/jazzsonic.c | 6 +- + drivers/net/ethernet/natsemi/macsonic.c | 27 +- + drivers/net/ethernet/natsemi/xtsonic.c | 6 +- + drivers/net/ethernet/neterion/s2io.c | 25 +- + drivers/net/ethernet/neterion/s2io.h | 1 - + drivers/net/ethernet/neterion/vxge/vxge-main.c | 31 +- + .../net/ethernet/netronome/nfp/flower/metadata.c | 70 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 3 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 4 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 8 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 6 +- + drivers/net/ethernet/nvidia/forcedeth.c | 10 +- + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 12 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 3 - + drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c | 4 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 8 +- + .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 8 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 24 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 19 + + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 102 + + drivers/net/ethernet/qlogic/qed/qed_int.c | 22 + + drivers/net/ethernet/qlogic/qed/qed_int.h | 13 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 100 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 22 + + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 22 + + drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h | 1 + + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 2 + + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 10 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 42 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 21 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 3 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 91 +- + drivers/net/ethernet/qlogic/qede/qede_ptp.c | 5 - + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 8 +- + drivers/net/ethernet/qualcomm/emac/emac-ethtool.c | 8 +- + drivers/net/ethernet/qualcomm/qca_debug.c | 8 +- + drivers/net/ethernet/realtek/8139cp.c | 4 +- + drivers/net/ethernet/realtek/r8169_main.c | 67 +- + drivers/net/ethernet/renesas/ravb_main.c | 18 +- + drivers/net/ethernet/renesas/sh_eth.c | 11 +- + drivers/net/ethernet/rocker/rocker_main.c | 12 - + drivers/net/ethernet/sfc/ef100_ethtool.c | 7 +- + drivers/net/ethernet/sfc/ef100_nic.c | 6 +- + drivers/net/ethernet/sfc/efx.c | 3 +- + drivers/net/ethernet/sfc/efx_channels.c | 1 + + drivers/net/ethernet/sfc/efx_common.c | 1 + + drivers/net/ethernet/sfc/ethtool.c | 14 +- + drivers/net/ethernet/sfc/falcon/efx.c | 2 +- + drivers/net/ethernet/sfc/falcon/ethtool.c | 14 +- + drivers/net/ethernet/sfc/mcdi_port_common.c | 4 +- + drivers/net/ethernet/sfc/ptp.c | 3 - + drivers/net/ethernet/sfc/rx.c | 2 +- + drivers/net/ethernet/smsc/smc9194.c | 6 +- + drivers/net/ethernet/socionext/netsec.c | 15 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 1 + + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 33 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 9 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 216 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 5 + + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 121 + + drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c | 4 +- + drivers/net/ethernet/sun/cassini.c | 26 +- + drivers/net/ethernet/tehuti/tehuti.c | 40 +- + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 7 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- + drivers/net/ethernet/ti/cpmac.c | 8 +- + drivers/net/ethernet/ti/cpsw_ethtool.c | 8 +- + drivers/net/ethernet/ti/cpsw_priv.c | 28 +- + drivers/net/ethernet/ti/cpsw_priv.h | 10 +- + drivers/net/ethernet/ti/davinci_emac.c | 69 +- + drivers/net/ethernet/ti/netcp_ethss.c | 4 - + drivers/net/ethernet/toshiba/spider_net.c | 12 +- + drivers/net/ethernet/toshiba/spider_net_ethtool.c | 4 +- + drivers/net/ethernet/vertexcom/Kconfig | 25 + + drivers/net/ethernet/vertexcom/Makefile | 6 + + drivers/net/ethernet/vertexcom/mse102x.c | 769 ++ + drivers/net/ethernet/xilinx/ll_temac_main.c | 14 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 86 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 9 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 3 - + drivers/net/fddi/skfp/hwmtm.c | 6 +- + drivers/net/fddi/skfp/smt.c | 14 +- + drivers/net/geneve.c | 9 +- + drivers/net/hamradio/hdlcdrv.c | 1 + + drivers/net/hamradio/scc.c | 1 + + drivers/net/hyperv/netvsc.c | 10 +- + drivers/net/hyperv/netvsc_bpf.c | 2 +- + drivers/net/hyperv/netvsc_drv.c | 8 +- + drivers/net/ifb.c | 146 +- + drivers/net/ipa/gsi.c | 114 +- + drivers/net/ipa/gsi.h | 21 +- + drivers/net/ipa/gsi_reg.h | 4 + + drivers/net/ipa/ipa_data-v4.5.c | 7 +- + drivers/net/ipa/ipa_endpoint.c | 93 +- + drivers/net/ipa/ipa_main.c | 6 +- + drivers/net/ipa/ipa_mem.c | 4 +- + drivers/net/ipa/ipa_modem.c | 10 - + drivers/net/ipa/ipa_modem.h | 3 - + drivers/net/ipa/ipa_table.c | 48 +- + drivers/net/ipvlan/ipvlan_core.c | 3 +- + drivers/net/ipvlan/ipvlan_main.c | 11 +- + drivers/net/loopback.c | 1 + + drivers/net/macvlan.c | 11 +- + drivers/net/mctp/Kconfig | 18 + + drivers/net/mctp/Makefile | 1 + + drivers/net/mctp/mctp-serial.c | 515 + + drivers/net/mdio/Kconfig | 2 +- + drivers/net/mdio/mdio-ipq8064.c | 2 +- + drivers/net/mdio/mdio-mscc-miim.c | 176 +- + drivers/net/netconsole.c | 2 +- + drivers/net/netdevsim/dev.c | 4 +- + drivers/net/netdevsim/ethtool.c | 8 +- + drivers/net/pcs/pcs-lynx.c | 36 +- + drivers/net/phy/dp83640.c | 3 - + drivers/net/phy/dp83869.c | 42 +- + drivers/net/phy/mdio_bus.c | 18 +- + drivers/net/phy/micrel.c | 99 + + drivers/net/phy/mscc/mscc_ptp.c | 3 - + drivers/net/phy/nxp-c45-tja11xx.c | 220 + + drivers/net/phy/phy-core.c | 2 +- + drivers/net/phy/phylink.c | 492 +- + drivers/net/ppp/ppp_generic.c | 5 +- + drivers/net/tun.c | 2 +- + drivers/net/usb/ax88179_178a.c | 17 +- + drivers/net/usb/lan78xx.c | 1214 +- + drivers/net/usb/r8152.c | 8 +- + drivers/net/veth.c | 35 +- + drivers/net/virtio_net.c | 10 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 10 +- + drivers/net/vrf.c | 9 +- + drivers/net/vxlan.c | 10 +- + drivers/net/wan/fsl_ucc_hdlc.c | 62 +- + drivers/net/wan/ixp4xx_hss.c | 261 +- + drivers/net/wan/lmc/lmc_main.c | 2 +- + drivers/net/wireguard/queueing.h | 4 +- + drivers/net/wireless/ath/ar5523/ar5523.c | 4 + + drivers/net/wireless/ath/ath10k/core.c | 83 +- + drivers/net/wireless/ath/ath10k/core.h | 6 + + drivers/net/wireless/ath/ath10k/coredump.c | 6 +- + drivers/net/wireless/ath/ath10k/htt.h | 110 - + drivers/net/wireless/ath/ath10k/htt_tx.c | 3 + + drivers/net/wireless/ath/ath10k/hw.h | 3 + + drivers/net/wireless/ath/ath10k/mac.c | 9 +- + drivers/net/wireless/ath/ath10k/txrx.c | 2 - + drivers/net/wireless/ath/ath10k/wmi.c | 33 +- + drivers/net/wireless/ath/ath10k/wmi.h | 4 +- + drivers/net/wireless/ath/ath11k/ahb.c | 28 +- + drivers/net/wireless/ath/ath11k/ce.c | 55 +- + drivers/net/wireless/ath/ath11k/ce.h | 3 +- + drivers/net/wireless/ath/ath11k/core.c | 272 +- + drivers/net/wireless/ath/ath11k/core.h | 52 +- + drivers/net/wireless/ath/ath11k/dbring.c | 46 +- + drivers/net/wireless/ath/ath11k/dbring.h | 4 +- + drivers/net/wireless/ath/ath11k/debug.c | 12 +- + drivers/net/wireless/ath/ath11k/debug.h | 3 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 41 +- + drivers/net/wireless/ath/ath11k/debugfs.h | 8 + + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 78 +- + drivers/net/wireless/ath/ath11k/debugfs_sta.h | 2 - + drivers/net/wireless/ath/ath11k/dp.c | 49 +- + drivers/net/wireless/ath/ath11k/dp.h | 58 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 686 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 247 +- + drivers/net/wireless/ath/ath11k/dp_tx.h | 3 + + drivers/net/wireless/ath/ath11k/hal.c | 57 +- + drivers/net/wireless/ath/ath11k/hal.h | 3 + + drivers/net/wireless/ath/ath11k/hal_desc.h | 19 + + drivers/net/wireless/ath/ath11k/hal_rx.c | 74 +- + drivers/net/wireless/ath/ath11k/hal_rx.h | 56 +- + drivers/net/wireless/ath/ath11k/htc.c | 71 +- + drivers/net/wireless/ath/ath11k/htc.h | 9 +- + drivers/net/wireless/ath/ath11k/hw.c | 16 +- + drivers/net/wireless/ath/ath11k/hw.h | 34 +- + drivers/net/wireless/ath/ath11k/mac.c | 962 +- + drivers/net/wireless/ath/ath11k/mac.h | 17 + + drivers/net/wireless/ath/ath11k/mhi.c | 49 +- + drivers/net/wireless/ath/ath11k/pci.c | 246 +- + drivers/net/wireless/ath/ath11k/pci.h | 3 + + drivers/net/wireless/ath/ath11k/peer.h | 1 + + drivers/net/wireless/ath/ath11k/qmi.c | 214 +- + drivers/net/wireless/ath/ath11k/qmi.h | 17 +- + drivers/net/wireless/ath/ath11k/reg.c | 120 +- + drivers/net/wireless/ath/ath11k/spectral.c | 14 + + drivers/net/wireless/ath/ath11k/trace.c | 1 + + drivers/net/wireless/ath/ath11k/trace.h | 200 + + drivers/net/wireless/ath/ath11k/wmi.c | 633 +- + drivers/net/wireless/ath/ath11k/wmi.h | 119 +- + drivers/net/wireless/ath/ath5k/base.c | 50 +- + drivers/net/wireless/ath/ath6kl/htc.h | 19 +- + drivers/net/wireless/ath/ath6kl/htc_mbox.c | 15 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 14 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 7 + + drivers/net/wireless/ath/ath9k/htc.h | 2 + + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 13 + + drivers/net/wireless/ath/ath9k/wmi.c | 4 + + drivers/net/wireless/ath/ath9k/xmit.c | 45 +- + drivers/net/wireless/ath/carl9170/main.c | 9 +- + drivers/net/wireless/ath/carl9170/tx.c | 12 +- + drivers/net/wireless/ath/regd.h | 1 + + drivers/net/wireless/ath/regd_common.h | 3 + + drivers/net/wireless/ath/wcn36xx/dxe.c | 96 +- + drivers/net/wireless/ath/wcn36xx/dxe.h | 1 + + drivers/net/wireless/ath/wcn36xx/hal.h | 29 +- + drivers/net/wireless/ath/wcn36xx/main.c | 74 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 125 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 5 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 41 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 21 + + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 19 + + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/intel/iwlwifi/Kconfig | 26 + + drivers/net/wireless/intel/iwlwifi/Makefile | 1 + + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 85 +- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 8 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 51 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 23 +- + drivers/net/wireless/intel/iwlwifi/fw/api/alive.h | 26 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 23 +- + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 81 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 62 + + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 35 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 30 +- + .../net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h | 9 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 22 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 56 +- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 93 +- + drivers/net/wireless/intel/iwlwifi/fw/api/stats.h | 92 +- + .../intel/iwlwifi/fw/api/{soc.h => system.h} | 16 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 11 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 28 +- + drivers/net/wireless/intel/iwlwifi/fw/dump.c | 153 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 18 + + drivers/net/wireless/intel/iwlwifi/fw/file.h | 1 - + drivers/net/wireless/intel/iwlwifi/fw/img.c | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/img.h | 4 + + drivers/net/wireless/intel/iwlwifi/fw/init.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 88 + + drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 20 + + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 15 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 24 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 70 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 96 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 4 + + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-io.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 69 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 11 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 9 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 28 +- + drivers/net/wireless/intel/iwlwifi/mei/Makefile | 8 + + drivers/net/wireless/intel/iwlwifi/mei/internal.h | 20 + + drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h | 505 + + drivers/net/wireless/intel/iwlwifi/mei/main.c | 2001 +++ + drivers/net/wireless/intel/iwlwifi/mei/net.c | 409 + + drivers/net/wireless/intel/iwlwifi/mei/sap.h | 733 ++ + .../net/wireless/intel/iwlwifi/mei/trace-data.h | 82 + + drivers/net/wireless/intel/iwlwifi/mei/trace.c | 15 + + drivers/net/wireless/intel/iwlwifi/mei/trace.h | 76 + + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 184 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 9 + + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 227 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 189 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 87 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 261 +- + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 62 +- + drivers/net/wireless/intel/iwlwifi/mvm/rfi.c | 48 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 105 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 261 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 53 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 91 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 10 + + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 4 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 36 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 109 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 51 +- + .../net/wireless/intel/iwlwifi/mvm/vendor-cmd.c | 152 + + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 343 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 7 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 13 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 136 +- + drivers/net/wireless/intel/iwlwifi/queue/tx.c | 8 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 5 +- + drivers/net/wireless/intersil/hostap/hostap_wlan.h | 14 +- + drivers/net/wireless/intersil/p54/txrx.c | 6 +- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/net/wireless/marvell/libertas/host.h | 10 +- + drivers/net/wireless/marvell/libertas/tx.c | 5 +- + .../net/wireless/marvell/libertas_tf/libertas_tf.h | 36 +- + drivers/net/wireless/marvell/libertas_tf/main.c | 3 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 4 +- + drivers/net/wireless/marvell/mwifiex/init.c | 2 +- + drivers/net/wireless/marvell/mwifiex/main.c | 18 + + drivers/net/wireless/marvell/mwifiex/main.h | 5 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 3 + + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 28 +- + drivers/net/wireless/marvell/mwifiex/sta_event.c | 11 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 3 +- + drivers/net/wireless/marvell/mwl8k.c | 10 +- + drivers/net/wireless/mediatek/mt76/debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/dma.c | 19 +- + drivers/net/wireless/mediatek/mt76/eeprom.c | 2 + + drivers/net/wireless/mediatek/mt76/mac80211.c | 90 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 12 +- + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 31 +- + drivers/net/wireless/mediatek/mt76/mt7603/mcu.c | 4 +- + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 3 + + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 122 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 2 + + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 15 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 200 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.h | 127 - + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 1 + + .../net/wireless/mediatek/mt76/mt7615/pci_init.c | 8 +- + .../net/wireless/mediatek/mt76/mt7615/testmode.c | 25 +- + .../net/wireless/mediatek/mt76/mt7615/usb_mcu.c | 2 +- + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 3 - + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 169 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 521 +- + drivers/net/wireless/mediatek/mt76/mt76x0/init.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 34 +- + drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h | 2 + + drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x02.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x2/init.c | 29 + + drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h | 2 + + .../net/wireless/mediatek/mt76/mt76x2/pci_init.c | 5 +- + .../net/wireless/mediatek/mt76/mt76x2/pci_main.c | 7 +- + .../net/wireless/mediatek/mt76/mt76x2/usb_init.c | 4 +- + .../net/wireless/mediatek/mt76/mt76x2/usb_main.c | 9 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 227 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 83 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 205 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 70 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 267 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 841 +- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 27 +- + drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 1 + + .../net/wireless/mediatek/mt76/mt7915/testmode.c | 17 +- + .../net/wireless/mediatek/mt76/mt7921/debugfs.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 136 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 83 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 160 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 153 +- + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 2 + + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 25 +- + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 4 + + .../net/wireless/mediatek/mt76/mt7921/pci_mcu.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 51 +- + .../net/wireless/mediatek/mt76/mt7921/sdio_mac.c | 2 +- + .../net/wireless/mediatek/mt76/mt7921/sdio_mcu.c | 2 +- + .../net/wireless/mediatek/mt76/mt7921/testmode.c | 4 +- + drivers/net/wireless/mediatek/mt76/sdio.c | 11 +- + drivers/net/wireless/mediatek/mt76/sdio_txrx.c | 3 +- + drivers/net/wireless/mediatek/mt76/testmode.c | 36 +- + drivers/net/wireless/mediatek/mt76/testmode.h | 6 + + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 10 +- + drivers/net/wireless/microchip/wilc1000/hif.c | 5 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 28 +- + drivers/net/wireless/microchip/wilc1000/netdev.h | 2 + + drivers/net/wireless/microchip/wilc1000/sdio.c | 2 + + drivers/net/wireless/microchip/wilc1000/spi.c | 80 +- + drivers/net/wireless/microchip/wilc1000/wlan.c | 41 +- + drivers/net/wireless/microchip/wilc1000/wlan.h | 2 - + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 1 + + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 17 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 - + drivers/net/wireless/realtek/rtw88/Makefile | 1 + + drivers/net/wireless/realtek/rtw88/bf.c | 14 +- + drivers/net/wireless/realtek/rtw88/bf.h | 7 +- + drivers/net/wireless/realtek/rtw88/debug.c | 100 +- + drivers/net/wireless/realtek/rtw88/debug.h | 1 + + drivers/net/wireless/realtek/rtw88/fw.c | 388 + + drivers/net/wireless/realtek/rtw88/fw.h | 143 + + drivers/net/wireless/realtek/rtw88/mac80211.c | 91 +- + drivers/net/wireless/realtek/rtw88/main.c | 88 +- + drivers/net/wireless/realtek/rtw88/main.h | 77 +- + drivers/net/wireless/realtek/rtw88/pci.c | 69 +- + drivers/net/wireless/realtek/rtw88/pci.h | 2 + + drivers/net/wireless/realtek/rtw88/phy.c | 63 +- + drivers/net/wireless/realtek/rtw88/phy.h | 1 + + drivers/net/wireless/realtek/rtw88/ps.c | 3 + + drivers/net/wireless/realtek/rtw88/ps.h | 1 + + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.h | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 4 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 14 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 4 + + drivers/net/wireless/realtek/rtw88/rx.c | 10 + + drivers/net/wireless/realtek/rtw88/sar.c | 114 + + drivers/net/wireless/realtek/rtw88/sar.h | 22 + + drivers/net/wireless/realtek/rtw88/tx.c | 36 +- + drivers/net/wireless/realtek/rtw89/cam.c | 61 +- + drivers/net/wireless/realtek/rtw89/cam.h | 472 +- + drivers/net/wireless/realtek/rtw89/coex.c | 73 +- + drivers/net/wireless/realtek/rtw89/coex.h | 6 + + drivers/net/wireless/realtek/rtw89/core.c | 93 +- + drivers/net/wireless/realtek/rtw89/core.h | 39 +- + drivers/net/wireless/realtek/rtw89/debug.c | 11 +- + drivers/net/wireless/realtek/rtw89/fw.c | 7 +- + drivers/net/wireless/realtek/rtw89/fw.h | 2170 ++-- + drivers/net/wireless/realtek/rtw89/mac.c | 21 +- + drivers/net/wireless/realtek/rtw89/mac.h | 11 + + drivers/net/wireless/realtek/rtw89/mac80211.c | 7 +- + drivers/net/wireless/realtek/rtw89/phy.c | 158 +- + drivers/net/wireless/realtek/rtw89/phy.h | 60 + + drivers/net/wireless/realtek/rtw89/reg.h | 25 +- + drivers/net/wireless/realtek/rtw89/regd.c | 375 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 25 +- + .../net/wireless/realtek/rtw89/rtw8852a_table.c | 12201 +++++++++++-------- + drivers/net/wireless/realtek/rtw89/txrx.h | 91 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 3 + + drivers/net/wireless/rsi/rsi_91x_main.c | 4 + + drivers/net/wireless/rsi/rsi_91x_usb.c | 9 +- + drivers/net/wireless/rsi/rsi_usb.h | 2 + + drivers/net/wireless/ti/wl1251/main.c | 6 + + drivers/net/wireless/ti/wlcore/sdio.c | 2 +- + drivers/net/wwan/Kconfig | 25 + + drivers/net/wwan/Makefile | 1 + + drivers/net/wwan/iosm/Makefile | 4 + + drivers/net/wwan/iosm/iosm_ipc_debugfs.c | 29 + + drivers/net/wwan/iosm/iosm_ipc_debugfs.h | 17 + + drivers/net/wwan/iosm/iosm_ipc_imem.c | 11 +- + drivers/net/wwan/iosm/iosm_ipc_imem.h | 8 + + drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 13 +- + drivers/net/wwan/iosm/iosm_ipc_imem_ops.h | 9 +- + drivers/net/wwan/iosm/iosm_ipc_mmio.c | 2 +- + drivers/net/wwan/iosm/iosm_ipc_mux.c | 28 +- + drivers/net/wwan/iosm/iosm_ipc_mux.h | 1 - + drivers/net/wwan/iosm/iosm_ipc_mux_codec.c | 18 +- + drivers/net/wwan/iosm/iosm_ipc_pcie.c | 52 +- + drivers/net/wwan/iosm/iosm_ipc_port.c | 2 +- + drivers/net/wwan/iosm/iosm_ipc_trace.c | 182 + + drivers/net/wwan/iosm/iosm_ipc_trace.h | 74 + + drivers/net/wwan/iosm/iosm_ipc_wwan.c | 3 +- + drivers/net/wwan/iosm/iosm_ipc_wwan.h | 10 - + drivers/net/wwan/qcom_bam_dmux.c | 907 ++ + drivers/net/wwan/wwan_core.c | 39 +- + drivers/net/xen-netfront.c | 2 +- + drivers/nfc/fdp/i2c.c | 4 +- + drivers/nfc/st21nfca/i2c.c | 4 +- + drivers/pcmcia/pcmcia_cis.c | 3 +- + drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 9 + + drivers/ptp/ptp_ines.c | 4 - + drivers/s390/net/ctcm_dbug.h | 1 + + drivers/s390/net/ctcm_fsms.c | 2 +- + drivers/s390/net/lcs.c | 11 +- + drivers/s390/net/qeth_core.h | 4 +- + drivers/s390/net/qeth_core_main.c | 89 +- + drivers/s390/net/qeth_ethtool.c | 4 +- + drivers/s390/net/qeth_l2_main.c | 52 +- + drivers/s390/net/qeth_l3_main.c | 13 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- + fs/nfs/dir.c | 1 + + fs/nfs/fs_context.c | 1 + + fs/proc/proc_net.c | 19 +- + fs/select.c | 1 + + include/asm-generic/sections.h | 14 +- + include/linux/atalk.h | 2 +- + include/linux/avf/virtchnl.h | 377 + + include/linux/bpf-cgroup-defs.h | 70 + + include/linux/bpf-cgroup.h | 57 +- + include/linux/bpf-netns.h | 8 +- + include/linux/bpf.h | 119 +- + include/linux/bpf_local_storage.h | 6 + + include/linux/bpf_verifier.h | 34 + + include/linux/btf.h | 89 +- + include/linux/btf_ids.h | 20 +- + include/linux/can/bittiming.h | 7 - + include/linux/cgroup-defs.h | 2 +- + include/linux/dsa/8021q.h | 9 +- + include/linux/dsa/loop.h | 1 + + include/linux/dsa/ocelot.h | 12 +- + include/linux/dsa/sja1105.h | 62 +- + include/linux/ethtool.h | 26 +- + include/linux/filter.h | 9 +- + include/linux/ieee80211.h | 11 +- + include/linux/if_eql.h | 1 + + include/linux/if_vlan.h | 3 + + include/linux/inetdevice.h | 2 + + include/linux/mdio/mdio-mscc-miim.h | 19 + + include/linux/mei_cl_bus.h | 3 + + include/linux/mlx5/device.h | 1 + + include/linux/mlx5/driver.h | 4 + + include/linux/mlx5/mlx5_ifc.h | 37 +- + include/linux/mmc/sdio_ids.h | 1 + + include/linux/mroute_base.h | 2 + + include/linux/net/intel/iidc.h | 7 +- + include/linux/netdevice.h | 518 +- + include/linux/netpoll.h | 1 + + include/linux/once.h | 2 +- + include/linux/pcs-lynx.h | 9 +- + include/linux/perf_event.h | 1 + + include/linux/phy.h | 2 +- + include/linux/phylink.h | 96 +- + include/linux/qed/qed_if.h | 14 + + include/linux/ref_tracker.h | 73 + + include/linux/regmap.h | 7 + + include/linux/rfkill.h | 7 + + include/linux/seq_file_net.h | 3 +- + include/linux/siphash.h | 2 + + include/linux/skbuff.h | 76 +- + include/linux/skmsg.h | 6 - + include/linux/stmmac.h | 2 + + include/linux/tcp.h | 2 + + include/linux/u64_stats_sync.h | 42 +- + include/linux/wwan.h | 18 +- + include/net/act_api.h | 27 +- + include/net/af_unix.h | 3 +- + include/net/arp.h | 8 +- + include/net/ax25.h | 3 + + include/net/bareudp.h | 13 +- + include/net/bluetooth/bluetooth.h | 9 + + include/net/bluetooth/hci.h | 86 +- + include/net/bluetooth/hci_core.h | 73 +- + include/net/bluetooth/hci_sync.h | 108 + + include/net/bluetooth/mgmt.h | 9 +- + include/net/bond_options.h | 1 + + include/net/bonding.h | 1 + + include/net/cfg80211.h | 90 +- + include/net/checksum.h | 4 + + include/net/codel.h | 2 - + include/net/codel_impl.h | 2 + + include/net/codel_qdisc.h | 2 + + include/net/devlink.h | 46 +- + include/net/dsa.h | 129 +- + include/net/dst.h | 1 + + include/net/failover.h | 1 + + include/net/fib_rules.h | 21 - + include/net/flow_offload.h | 20 +- + include/net/gro.h | 421 +- + include/net/if_inet6.h | 1 + + include/net/inet_connection_sock.h | 2 +- + include/net/inet_sock.h | 12 + + include/net/ip.h | 9 +- + include/net/ip6_checksum.h | 20 +- + include/net/ip6_fib.h | 1 + + include/net/ip6_route.h | 18 +- + include/net/ip6_tunnel.h | 1 + + include/net/ip_fib.h | 2 + + include/net/ip_tunnels.h | 3 + + include/net/ipv6.h | 4 +- + include/net/iucv/af_iucv.h | 10 +- + include/net/llc_conn.h | 1 + + include/net/mac80211.h | 57 +- + include/net/ndisc.h | 16 +- + include/net/neighbour.h | 14 + + include/net/net_namespace.h | 34 + + include/net/net_trackers.h | 18 + + include/net/netfilter/nf_conntrack_act_ct.h | 50 + + include/net/netfilter/nf_conntrack_extend.h | 4 + + include/net/netns/bpf.h | 9 +- + include/net/netns/core.h | 1 - + include/net/netns/ipv4.h | 3 + + include/net/pkt_cls.h | 46 +- + include/net/route.h | 1 + + include/net/sch_generic.h | 2 +- + include/net/sctp/sctp.h | 4 +- + include/net/sctp/structs.h | 15 +- + include/net/sock.h | 111 +- + include/net/tc_act/tc_gate.h | 5 - + include/net/tc_act/tc_mirred.h | 1 + + include/net/tcp.h | 18 +- + include/net/udp.h | 24 - + include/net/vxlan.h | 1 + + include/net/xdp_priv.h | 1 - + include/net/xdp_sock.h | 1 + + include/net/xfrm.h | 3 +- + include/soc/mscc/ocelot.h | 65 +- + include/soc/mscc/ocelot_ana.h | 10 + + include/soc/mscc/ocelot_vcap.h | 1 + + include/soc/mscc/vsc7514_regs.h | 29 + + include/uapi/linux/bpf.h | 165 +- + include/uapi/linux/btf.h | 3 +- + include/uapi/linux/ethtool.h | 1 + + include/uapi/linux/ethtool_netlink.h | 1 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/net_tstamp.h | 17 +- + include/uapi/linux/nl80211.h | 63 +- + include/uapi/linux/pkt_cls.h | 9 +- + include/uapi/linux/rtnetlink.h | 2 + + include/uapi/linux/smc.h | 2 + + include/uapi/linux/smc_diag.h | 11 +- + include/uapi/linux/tty.h | 1 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 2 +- + kernel/bpf/Makefile | 4 + + kernel/bpf/bloom_filter.c | 6 + + kernel/bpf/bpf_inode_storage.c | 6 +- + kernel/bpf/bpf_iter.c | 35 + + kernel/bpf/bpf_local_storage.c | 50 +- + kernel/bpf/bpf_struct_ops.c | 6 +- + kernel/bpf/bpf_task_storage.c | 10 +- + kernel/bpf/btf.c | 541 +- + kernel/bpf/cgroup.c | 2 +- + kernel/bpf/core.c | 6 +- + kernel/bpf/cpumap.c | 4 +- + kernel/bpf/devmap.c | 4 +- + kernel/bpf/helpers.c | 31 +- + kernel/bpf/local_storage.c | 3 +- + kernel/bpf/lpm_trie.c | 2 +- + kernel/bpf/map_iter.c | 4 +- + kernel/bpf/mmap_unlock_work.h | 65 + + kernel/bpf/net_namespace.c | 1 + + kernel/bpf/reuseport_array.c | 6 +- + kernel/bpf/ringbuf.c | 2 +- + kernel/bpf/stackmap.c | 82 +- + kernel/bpf/syscall.c | 7 +- + kernel/bpf/task_iter.c | 82 +- + kernel/bpf/trampoline.c | 8 + + kernel/bpf/verifier.c | 900 +- + kernel/cgroup/cgroup.c | 1 + + kernel/sysctl.c | 1 + + kernel/trace/bpf_trace.c | 93 +- + kernel/trace/trace_kprobe.c | 1 + + kernel/trace/trace_uprobe.c | 1 + + lib/Kconfig | 5 + + lib/Kconfig.debug | 15 + + lib/Makefile | 4 +- + lib/objagg.c | 7 +- + lib/ref_tracker.c | 140 + + lib/test_bpf.c | 4 +- + lib/test_ref_tracker.c | 115 + + net/802/hippi.c | 2 +- + net/8021q/vlan.c | 4 +- + net/8021q/vlan_core.c | 7 +- + net/8021q/vlan_dev.c | 8 +- + net/8021q/vlanproc.c | 2 +- + net/Kconfig | 5 + + net/Kconfig.debug | 19 + + net/ax25/ax25_dev.c | 8 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/netlink.c | 30 +- + net/batman-adv/network-coding.c | 8 +- + net/bluetooth/Makefile | 2 +- + net/bluetooth/aosp.c | 168 +- + net/bluetooth/aosp.h | 13 + + net/bluetooth/bnep/sock.c | 1 + + net/bluetooth/cmtp/core.c | 4 +- + net/bluetooth/eir.h | 2 + + net/bluetooth/hci_codec.c | 18 +- + net/bluetooth/hci_conn.c | 325 +- + net/bluetooth/hci_core.c | 1356 +-- + net/bluetooth/hci_event.c | 3330 ++--- + net/bluetooth/hci_request.c | 567 +- + net/bluetooth/hci_request.h | 18 +- + net/bluetooth/hci_sock.c | 11 +- + net/bluetooth/hci_sync.c | 5281 ++++++++ + net/bluetooth/hci_sysfs.c | 2 + + net/bluetooth/hidp/sock.c | 1 + + net/bluetooth/l2cap_core.c | 2 +- + net/bluetooth/l2cap_sock.c | 32 +- + net/bluetooth/mgmt.c | 2408 ++-- + net/bluetooth/mgmt_util.c | 81 +- + net/bluetooth/mgmt_util.h | 8 + + net/bluetooth/msft.c | 513 +- + net/bluetooth/msft.h | 20 +- + net/bridge/br_if.c | 18 +- + net/bridge/br_ioctl.c | 76 +- + net/bridge/br_netfilter_hooks.c | 7 +- + net/bridge/br_private.h | 1 + + net/bridge/br_sysfs_br.c | 7 +- + net/bridge/br_vlan.c | 4 +- + net/caif/caif_socket.c | 1 + + net/caif/cfserl.c | 1 - + net/core/Makefile | 4 +- + net/core/bpf_sk_storage.c | 10 +- + net/core/dev.c | 731 +- + net/core/dev_addr_lists.c | 93 +- + net/core/dev_addr_lists_test.c | 236 + + net/core/dev_ioctl.c | 7 +- + net/core/devlink.c | 81 +- + net/core/drop_monitor.c | 6 +- + net/core/dst.c | 8 +- + net/core/failover.c | 4 +- + net/core/fib_rules.c | 25 +- + net/core/filter.c | 106 +- + net/core/flow_dissector.c | 3 +- + net/core/flow_offload.c | 46 +- + net/core/gro.c | 766 ++ + net/core/link_watch.c | 17 +- + net/core/lwt_bpf.c | 1 + + net/core/neighbour.c | 22 +- + net/core/net-sysfs.c | 34 +- + net/core/net_namespace.c | 3 + + net/core/netpoll.c | 4 +- + net/core/of_net.c | 33 +- + net/core/pktgen.c | 8 +- + net/core/rtnetlink.c | 15 +- + net/core/secure_seq.c | 4 +- + net/core/skbuff.c | 186 +- + net/core/sock.c | 71 +- + net/core/sock_diag.c | 1 + + net/core/sock_map.c | 2 +- + net/core/sysctl_net_core.c | 1 + + net/core/xdp.c | 10 +- + net/dccp/proto.c | 27 +- + net/dccp/trace.h | 4 +- + net/decnet/dn_nsp_in.c | 1 + + net/decnet/dn_rules.c | 5 - + net/dsa/dsa.c | 2 +- + net/dsa/dsa2.c | 130 +- + net/dsa/dsa_priv.h | 64 +- + net/dsa/port.c | 179 +- + net/dsa/slave.c | 52 +- + net/dsa/switch.c | 80 +- + net/dsa/tag_8021q.c | 20 +- + net/dsa/tag_dsa.c | 5 +- + net/dsa/tag_ocelot.c | 2 +- + net/dsa/tag_ocelot_8021q.c | 52 +- + net/dsa/tag_sja1105.c | 214 +- + net/ethernet/eth.c | 7 +- + net/ethtool/cabletest.c | 4 +- + net/ethtool/channels.c | 2 +- + net/ethtool/coalesce.c | 2 +- + net/ethtool/common.c | 1 + + net/ethtool/debug.c | 2 +- + net/ethtool/eee.c | 2 +- + net/ethtool/features.c | 3 +- + net/ethtool/fec.c | 2 +- + net/ethtool/ioctl.c | 20 +- + net/ethtool/linkinfo.c | 2 +- + net/ethtool/linkmodes.c | 2 +- + net/ethtool/module.c | 2 +- + net/ethtool/netlink.c | 10 +- + net/ethtool/netlink.h | 9 +- + net/ethtool/pause.c | 2 +- + net/ethtool/privflags.c | 2 +- + net/ethtool/rings.c | 34 +- + net/ethtool/stats.c | 15 +- + net/ethtool/tunnels.c | 6 +- + net/ethtool/wol.c | 2 +- + net/hsr/hsr_device.c | 6 +- + net/ieee802154/socket.c | 4 +- + net/ipv4/af_inet.c | 29 +- + net/ipv4/arp.c | 33 +- + net/ipv4/bpf_tcp_ca.c | 6 +- + net/ipv4/devinet.c | 4 +- + net/ipv4/esp4_offload.c | 1 + + net/ipv4/fib_rules.c | 6 - + net/ipv4/fib_semantics.c | 12 +- + net/ipv4/fou.c | 26 +- + net/ipv4/gre_offload.c | 13 +- + net/ipv4/igmp.c | 1 - + net/ipv4/inet_connection_sock.c | 2 +- + net/ipv4/inet_hashtables.c | 8 +- + net/ipv4/ip_output.c | 1 - + net/ipv4/ip_sockglue.c | 2 +- + net/ipv4/ipmr.c | 8 +- + net/ipv4/nexthop.c | 9 +- + net/ipv4/ping.c | 14 +- + net/ipv4/raw.c | 15 +- + net/ipv4/route.c | 83 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/tcp.c | 95 +- + net/ipv4/tcp_input.c | 8 +- + net/ipv4/tcp_ipv4.c | 10 +- + net/ipv4/tcp_offload.c | 1 + + net/ipv4/tcp_output.c | 2 +- + net/ipv4/udp.c | 11 +- + net/ipv4/udp_offload.c | 32 +- + net/ipv4/xfrm4_policy.c | 2 +- + net/ipv6/addrconf.c | 4 +- + net/ipv6/addrconf_core.c | 2 +- + net/ipv6/af_inet6.c | 7 +- + net/ipv6/ah6.c | 5 +- + net/ipv6/esp6_offload.c | 1 + + net/ipv6/exthdrs.c | 1 - + net/ipv6/fib6_rules.c | 5 - + net/ipv6/inet6_hashtables.c | 8 +- + net/ipv6/ioam6.c | 16 +- + net/ipv6/ip6_fib.c | 1 + + net/ipv6/ip6_gre.c | 8 +- + net/ipv6/ip6_offload.c | 14 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ip6_tunnel.c | 4 +- + net/ipv6/ip6_vti.c | 4 +- + net/ipv6/ip6mr.c | 8 +- + net/ipv6/ipv6_sockglue.c | 17 +- + net/ipv6/route.c | 38 +- + net/ipv6/seg6_local.c | 1 + + net/ipv6/sit.c | 4 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/tcp_ipv6.c | 10 +- + net/ipv6/tcpv6_offload.c | 1 + + net/ipv6/udp.c | 9 +- + net/ipv6/udp_offload.c | 3 +- + net/ipv6/xfrm6_policy.c | 4 +- + net/iucv/af_iucv.c | 41 +- + net/iucv/iucv.c | 124 +- + net/kcm/kcmsock.c | 1 + + net/l2tp/l2tp_core.c | 52 +- + net/l2tp/l2tp_core.h | 2 +- + net/l2tp/l2tp_debugfs.c | 22 +- + net/llc/af_llc.c | 5 +- + net/llc/llc_proc.c | 2 +- + net/mac80211/cfg.c | 45 +- + net/mac80211/debugfs_sta.c | 9 +- + net/mac80211/driver-ops.h | 22 + + net/mac80211/ethtool.c | 8 +- + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/iface.c | 59 + + net/mac80211/main.c | 13 +- + net/mac80211/mlme.c | 67 +- + net/mac80211/rc80211_minstrel_ht.c | 2 - + net/mac80211/rx.c | 9 +- + net/mac80211/trace.h | 7 + + net/mac80211/tx.c | 10 +- + net/mac80211/util.c | 13 + + net/mac80211/wpa.c | 4 - + net/mctp/af_mctp.c | 3 +- + net/mctp/device.c | 53 +- + net/mctp/route.c | 7 +- + net/mctp/test/route-test.c | 5 - + net/mpls/af_mpls.c | 8 +- + net/mpls/internal.h | 13 +- + net/mptcp/pm_netlink.c | 22 +- + net/mptcp/protocol.c | 165 +- + net/mptcp/protocol.h | 5 + + net/mptcp/sockopt.c | 238 +- + net/mptcp/subflow.c | 9 +- + net/netfilter/ipvs/ip_vs_ctl.c | 7 +- + net/netfilter/nf_conntrack_core.c | 15 +- + net/netfilter/nf_conntrack_expect.c | 2 +- + net/netfilter/nf_conntrack_netlink.c | 4 +- + net/netfilter/nf_nat_core.c | 2 +- + net/netfilter/nfnetlink_hook.c | 1 + + net/netfilter/nfnetlink_queue.c | 6 - + net/netfilter/nft_fwd_netdev.c | 7 +- + net/netfilter/nft_reject_netdev.c | 1 + + net/netlink/af_netlink.c | 6 +- + net/openvswitch/conntrack.c | 6 + + net/openvswitch/vport-netdev.c | 9 +- + net/openvswitch/vport.h | 2 + + net/packet/af_packet.c | 19 +- + net/rds/send.c | 2 +- + net/rfkill/core.c | 12 + + net/rose/rose_in.c | 1 + + net/sched/act_api.c | 459 +- + net/sched/act_bpf.c | 2 +- + net/sched/act_connmark.c | 2 +- + net/sched/act_csum.c | 19 + + net/sched/act_ct.c | 51 +- + net/sched/act_ctinfo.c | 2 +- + net/sched/act_gact.c | 38 + + net/sched/act_gate.c | 51 +- + net/sched/act_ife.c | 2 +- + net/sched/act_ipt.c | 2 +- + net/sched/act_mirred.c | 68 +- + net/sched/act_mpls.c | 54 +- + net/sched/act_nat.c | 2 +- + net/sched/act_pedit.c | 36 +- + net/sched/act_police.c | 27 +- + net/sched/act_sample.c | 32 +- + net/sched/act_simple.c | 2 +- + net/sched/act_skbedit.c | 38 +- + net/sched/act_skbmod.c | 2 +- + net/sched/act_tunnel_key.c | 54 + + net/sched/act_vlan.c | 48 + + net/sched/cls_api.c | 278 +- + net/sched/cls_flower.c | 29 +- + net/sched/cls_matchall.c | 27 +- + net/sched/cls_u32.c | 12 +- + net/sched/sch_frag.c | 1 + + net/sched/sch_generic.c | 83 +- + net/sched/sch_netem.c | 18 +- + net/sctp/input.c | 27 +- + net/sctp/output.c | 2 +- + net/sctp/outqueue.c | 3 + + net/sctp/proc.c | 10 +- + net/sctp/sm_statefuns.c | 11 +- + net/sctp/socket.c | 11 +- + net/sctp/transport.c | 26 +- + net/smc/af_smc.c | 95 +- + net/smc/smc_clc.c | 1 - + net/smc/smc_core.c | 44 +- + net/smc/smc_core.h | 19 +- + net/smc/smc_diag.c | 16 +- + net/smc/smc_ib.c | 2 + + net/smc/smc_ib.h | 7 + + net/smc/smc_ism.c | 1 + + net/smc/smc_llc.c | 19 +- + net/smc/smc_pnet.c | 30 +- + net/smc/smc_tracepoint.h | 23 +- + net/smc/smc_wr.c | 15 +- + net/socket.c | 23 +- + net/switchdev/switchdev.c | 5 +- + net/tipc/bearer.c | 4 +- + net/tipc/crypto.c | 19 +- + net/tipc/link.c | 3 +- + net/tls/tls_sw.c | 36 +- + net/unix/af_unix.c | 572 +- + net/unix/diag.c | 23 +- + net/unix/sysctl_net_unix.c | 4 - + net/vmw_vsock/af_vsock.c | 1 + + net/vmw_vsock/hyperv_transport.c | 18 +- + net/wireless/chan.c | 78 +- + net/wireless/core.c | 9 + + net/wireless/core.h | 16 + + net/wireless/mlme.c | 153 +- + net/wireless/nl80211.c | 123 +- + net/wireless/rdev-ops.h | 17 + + net/wireless/reg.c | 2 + + net/wireless/scan.c | 121 +- + net/wireless/sme.c | 22 +- + net/wireless/trace.h | 47 +- + net/wireless/wext-sme.c | 12 +- + net/x25/x25_in.c | 2 +- + net/xdp/xsk.c | 4 - + net/xdp/xskmap.c | 1 + + net/xfrm/xfrm_device.c | 3 +- + net/xfrm/xfrm_state.c | 1 + + net/xfrm/xfrm_user.c | 1 + + samples/bpf/Makefile | 18 +- + samples/bpf/Makefile.target | 11 - + samples/bpf/cookie_uid_helper_example.c | 14 +- + samples/bpf/fds_example.c | 29 +- + samples/bpf/hbm.c | 11 +- + samples/bpf/lwt_len_hist_kern.c | 7 - + samples/bpf/map_perf_test_user.c | 15 +- + samples/bpf/sock_example.c | 12 +- + samples/bpf/sockex1_user.c | 15 +- + samples/bpf/sockex2_user.c | 14 +- + samples/bpf/test_cgrp2_array_pin.c | 4 +- + samples/bpf/test_cgrp2_attach.c | 13 +- + samples/bpf/test_cgrp2_sock.c | 8 +- + samples/bpf/test_lru_dist.c | 11 +- + samples/bpf/trace_output_user.c | 4 +- + samples/bpf/xdp_fwd_user.c | 12 +- + samples/bpf/xdp_redirect_cpu.bpf.c | 4 +- + samples/bpf/xdp_sample_pkts_user.c | 22 +- + samples/bpf/xdp_sample_user.h | 2 + + samples/bpf/xdpsock_ctrl_proc.c | 3 + + samples/bpf/xdpsock_user.c | 3 + + samples/bpf/xsk_fwd.c | 3 + + security/device_cgroup.c | 1 + + tools/bpf/bpftool/.gitignore | 2 +- + tools/bpf/bpftool/Documentation/Makefile | 5 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 17 +- + .../bpf/bpftool/Documentation/bpftool-feature.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-iter.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-link.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 13 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 72 +- + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 14 +- + .../bpftool/Documentation/bpftool-struct_ops.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 11 +- + tools/bpf/bpftool/Documentation/common_options.rst | 11 + + tools/bpf/bpftool/Documentation/substitutions.rst | 3 + + tools/bpf/bpftool/Makefile | 26 +- + tools/bpf/bpftool/bash-completion/bpftool | 5 +- + tools/bpf/bpftool/btf.c | 13 +- + tools/bpf/bpftool/btf_dumper.c | 42 +- + tools/bpf/bpftool/common.c | 1 + + tools/bpf/bpftool/feature.c | 28 +- + tools/bpf/bpftool/gen.c | 23 +- + tools/bpf/bpftool/iter.c | 7 +- + tools/bpf/bpftool/main.c | 27 +- + tools/bpf/bpftool/main.h | 3 +- + tools/bpf/bpftool/map.c | 36 +- + tools/bpf/bpftool/map_perf_ring.c | 9 +- + tools/bpf/bpftool/prog.c | 258 +- + tools/bpf/bpftool/struct_ops.c | 31 +- + tools/bpf/resolve_btfids/Makefile | 1 + + tools/bpf/resolve_btfids/main.c | 5 +- + tools/bpf/runqslower/Makefile | 4 +- + tools/bpf/runqslower/runqslower.c | 6 +- + tools/build/feature/test-bpf.c | 6 + + tools/include/uapi/linux/bpf.h | 165 +- + tools/include/uapi/linux/btf.h | 3 +- + tools/include/uapi/linux/if_link.h | 1 + + tools/lib/bpf/Makefile | 4 +- + tools/lib/bpf/bpf.c | 463 +- + tools/lib/bpf/bpf.h | 131 +- + tools/lib/bpf/bpf_gen_internal.h | 17 +- + tools/lib/bpf/bpf_tracing.h | 431 +- + tools/lib/bpf/btf.c | 206 +- + tools/lib/bpf/btf.h | 88 +- + tools/lib/bpf/btf_dump.c | 46 +- + tools/lib/bpf/gen_loader.c | 192 +- + tools/lib/bpf/libbpf.c | 1082 +- + tools/lib/bpf/libbpf.h | 292 +- + tools/lib/bpf/libbpf.map | 30 + + tools/lib/bpf/libbpf_common.h | 19 +- + tools/lib/bpf/libbpf_internal.h | 117 +- + tools/lib/bpf/libbpf_legacy.h | 13 +- + tools/lib/bpf/libbpf_probes.c | 271 +- + tools/lib/bpf/libbpf_version.h | 2 +- + tools/lib/bpf/linker.c | 10 +- + tools/lib/bpf/relo_core.c | 251 +- + tools/lib/bpf/relo_core.h | 103 +- + tools/lib/bpf/skel_internal.h | 13 +- + tools/lib/bpf/xsk.c | 61 +- + tools/perf/builtin-trace.c | 13 +- + tools/perf/tests/bpf.c | 4 + + tools/perf/util/bpf-loader.c | 3 + + tools/perf/util/bpf_counter.c | 18 +- + tools/scripts/Makefile.include | 13 +- + tools/testing/selftests/bpf/Makefile | 94 +- + tools/testing/selftests/bpf/README.rst | 9 +- + tools/testing/selftests/bpf/bench.c | 71 +- + tools/testing/selftests/bpf/bench.h | 11 +- + .../selftests/bpf/benchs/bench_bloom_filter_map.c | 17 +- + .../testing/selftests/bpf/benchs/bench_bpf_loop.c | 105 + + tools/testing/selftests/bpf/benchs/bench_count.c | 2 +- + tools/testing/selftests/bpf/benchs/bench_rename.c | 16 +- + .../testing/selftests/bpf/benchs/bench_ringbufs.c | 22 +- + tools/testing/selftests/bpf/benchs/bench_strncmp.c | 161 + + tools/testing/selftests/bpf/benchs/bench_trigger.c | 162 +- + .../selftests/bpf/benchs/run_bench_bpf_loop.sh | 15 + + .../selftests/bpf/benchs/run_bench_strncmp.sh | 12 + + tools/testing/selftests/bpf/benchs/run_common.sh | 15 + + tools/testing/selftests/bpf/btf_helpers.c | 17 +- + tools/testing/selftests/bpf/config | 2 + + tools/testing/selftests/bpf/flow_dissector_load.h | 3 +- + tools/testing/selftests/bpf/get_cgroup_id_user.c | 5 +- + .../selftests/bpf/map_tests/array_map_batch_ops.c | 13 +- + .../selftests/bpf/map_tests/htab_map_batch_ops.c | 13 +- + .../bpf/map_tests/lpm_trie_map_batch_ops.c | 15 +- + .../selftests/bpf/map_tests/sk_storage_map.c | 52 +- + tools/testing/selftests/bpf/prog_tests/align.c | 202 +- + tools/testing/selftests/bpf/prog_tests/atomics.c | 4 +- + .../selftests/bpf/prog_tests/bloom_filter_map.c | 36 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 21 +- + tools/testing/selftests/bpf/prog_tests/bpf_loop.c | 145 + + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 6 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 7 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 42 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 335 +- + .../selftests/bpf/prog_tests/btf_dedup_split.c | 119 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 45 +- + tools/testing/selftests/bpf/prog_tests/btf_split.c | 4 +- + tools/testing/selftests/bpf/prog_tests/btf_tag.c | 44 +- + tools/testing/selftests/bpf/prog_tests/btf_write.c | 67 +- + .../bpf/prog_tests/cgroup_attach_autodetach.c | 2 +- + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 14 +- + .../bpf/prog_tests/cgroup_attach_override.c | 2 +- + .../selftests/bpf/prog_tests/connect_force_port.c | 35 +- + tools/testing/selftests/bpf/prog_tests/core_kern.c | 14 + + .../testing/selftests/bpf/prog_tests/core_reloc.c | 84 +- + tools/testing/selftests/bpf/prog_tests/exhandler.c | 43 + + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 25 +- + .../selftests/bpf/prog_tests/fexit_stress.c | 33 +- + tools/testing/selftests/bpf/prog_tests/find_vma.c | 117 + + .../bpf/prog_tests/flow_dissector_load_bytes.c | 2 +- + .../bpf/prog_tests/flow_dissector_reattach.c | 4 +- + .../selftests/bpf/prog_tests/get_func_args_test.c | 44 + + .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 27 +- + .../testing/selftests/bpf/prog_tests/global_data.c | 2 +- + .../selftests/bpf/prog_tests/global_func_args.c | 2 +- + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 64 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 24 + + tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 14 + + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 2 +- + .../selftests/bpf/prog_tests/legacy_printk.c | 65 + + .../selftests/bpf/prog_tests/libbpf_probes.c | 124 + + .../selftests/bpf/prog_tests/load_bytes_relative.c | 2 +- + tools/testing/selftests/bpf/prog_tests/log_buf.c | 276 + + tools/testing/selftests/bpf/prog_tests/map_lock.c | 4 +- + tools/testing/selftests/bpf/prog_tests/map_ptr.c | 16 +- + .../selftests/bpf/prog_tests/migrate_reuseport.c | 4 +- + .../testing/selftests/bpf/prog_tests/perf_buffer.c | 6 +- + tools/testing/selftests/bpf/prog_tests/pinning.c | 4 +- + .../testing/selftests/bpf/prog_tests/pkt_access.c | 2 +- + .../selftests/bpf/prog_tests/pkt_md_access.c | 2 +- + .../selftests/bpf/prog_tests/prog_array_init.c | 32 + + .../selftests/bpf/prog_tests/queue_stack_map.c | 14 +- + .../raw_tp_writable_reject_nbd_invalid.c | 14 +- + .../bpf/prog_tests/raw_tp_writable_test_run.c | 29 +- + .../selftests/bpf/prog_tests/ringbuf_multi.c | 4 +- + .../selftests/bpf/prog_tests/select_reuseport.c | 22 +- + .../selftests/bpf/prog_tests/signal_pending.c | 2 +- + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 32 +- + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 4 +- + .../testing/selftests/bpf/prog_tests/skb_helpers.c | 2 +- + .../testing/selftests/bpf/prog_tests/sock_fields.c | 1 - + .../selftests/bpf/prog_tests/sockmap_basic.c | 4 +- + .../selftests/bpf/prog_tests/sockmap_ktls.c | 2 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 4 +- + tools/testing/selftests/bpf/prog_tests/sockopt.c | 19 +- + .../selftests/bpf/prog_tests/sockopt_inherit.c | 27 +- + .../selftests/bpf/prog_tests/sockopt_multi.c | 12 +- + tools/testing/selftests/bpf/prog_tests/spinlock.c | 4 +- + .../selftests/bpf/prog_tests/stacktrace_map.c | 6 +- + .../bpf/prog_tests/stacktrace_map_raw_tp.c | 6 +- + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 18 +- + .../selftests/bpf/prog_tests/task_fd_query_rawtp.c | 2 +- + .../selftests/bpf/prog_tests/task_fd_query_tp.c | 4 +- + .../testing/selftests/bpf/prog_tests/tcp_estats.c | 2 +- + tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 21 +- + .../testing/selftests/bpf/prog_tests/test_bpffs.c | 6 +- + .../selftests/bpf/prog_tests/test_global_funcs.c | 28 +- + .../selftests/bpf/prog_tests/test_local_storage.c | 20 +- + .../selftests/bpf/prog_tests/test_overhead.c | 20 +- + .../selftests/bpf/prog_tests/test_strncmp.c | 167 + + .../selftests/bpf/prog_tests/tp_attach_query.c | 2 +- + .../selftests/bpf/prog_tests/trampoline_count.c | 6 +- + tools/testing/selftests/bpf/prog_tests/xdp.c | 13 +- + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 6 +- + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 6 +- + .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 36 +- + .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 13 +- + tools/testing/selftests/bpf/prog_tests/xdp_info.c | 2 +- + tools/testing/selftests/bpf/prog_tests/xdp_perf.c | 2 +- + tools/testing/selftests/bpf/progs/bpf_iter_unix.c | 2 +- + tools/testing/selftests/bpf/progs/bpf_loop.c | 112 + + tools/testing/selftests/bpf/progs/bpf_loop_bench.c | 26 + + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 2 - + .../selftests/bpf/progs/{tag.c => btf_decl_tag.c} | 4 - + tools/testing/selftests/bpf/progs/btf_type_tag.c | 25 + + tools/testing/selftests/bpf/progs/core_kern.c | 104 + + tools/testing/selftests/bpf/progs/exhandler_kern.c | 43 + + tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 2 +- + tools/testing/selftests/bpf/progs/find_vma.c | 69 + + tools/testing/selftests/bpf/progs/find_vma_fail1.c | 29 + + tools/testing/selftests/bpf/progs/find_vma_fail2.c | 29 + + .../selftests/bpf/progs/get_func_args_test.c | 123 + + tools/testing/selftests/bpf/progs/local_storage.c | 24 +- + tools/testing/selftests/bpf/progs/map_ptr_kern.c | 16 +- + tools/testing/selftests/bpf/progs/pyperf.h | 71 +- + .../selftests/bpf/progs/pyperf600_bpf_loop.c | 6 + + tools/testing/selftests/bpf/progs/strncmp_bench.c | 50 + + tools/testing/selftests/bpf/progs/strncmp_test.c | 54 + + tools/testing/selftests/bpf/progs/strobemeta.h | 75 +- + .../selftests/bpf/progs/strobemeta_bpf_loop.c | 9 + + .../bpf/progs/test_ksyms_btf_write_check.c | 29 + + .../testing/selftests/bpf/progs/test_ksyms_weak.c | 2 +- + tools/testing/selftests/bpf/progs/test_l4lb.c | 2 +- + .../selftests/bpf/progs/test_l4lb_noinline.c | 2 +- + .../selftests/bpf/progs/test_legacy_printk.c | 73 + + tools/testing/selftests/bpf/progs/test_log_buf.c | 24 + + tools/testing/selftests/bpf/progs/test_map_lock.c | 2 +- + .../selftests/bpf/progs/test_prog_array_init.c | 39 + + .../selftests/bpf/progs/test_queue_stack_map.h | 2 +- + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 8 + + .../selftests/bpf/progs/test_sk_storage_tracing.c | 2 +- + tools/testing/selftests/bpf/progs/test_skb_ctx.c | 2 +- + .../selftests/bpf/progs/test_skc_to_unix_sock.c | 2 +- + tools/testing/selftests/bpf/progs/test_spin_lock.c | 2 +- + .../testing/selftests/bpf/progs/test_tcp_estats.c | 2 +- + .../selftests/bpf/progs/test_verif_scale2.c | 4 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 7 + + .../selftests/bpf/test_bpftool_synctypes.py | 94 +- + tools/testing/selftests/bpf/test_btf.h | 3 + + tools/testing/selftests/bpf/test_cgroup_storage.c | 11 +- + tools/testing/selftests/bpf/test_cpp.cpp | 9 +- + tools/testing/selftests/bpf/test_dev_cgroup.c | 3 +- + tools/testing/selftests/bpf/test_lirc_mode2_user.c | 6 +- + tools/testing/selftests/bpf/test_lpm_map.c | 27 +- + tools/testing/selftests/bpf/test_lru_map.c | 25 +- + tools/testing/selftests/bpf/test_maps.c | 118 +- + tools/testing/selftests/bpf/test_progs.c | 30 +- + tools/testing/selftests/bpf/test_sock.c | 23 +- + tools/testing/selftests/bpf/test_sock_addr.c | 46 +- + tools/testing/selftests/bpf/test_stub.c | 44 - + tools/testing/selftests/bpf/test_sysctl.c | 23 +- + tools/testing/selftests/bpf/test_tag.c | 8 +- + tools/testing/selftests/bpf/test_tcpnotify_user.c | 7 +- + tools/testing/selftests/bpf/test_verifier.c | 110 +- + tools/testing/selftests/bpf/testing_helpers.c | 62 + + tools/testing/selftests/bpf/testing_helpers.h | 6 + + .../selftests/bpf/verifier/btf_ctx_access.c | 12 + + .../testing/selftests/bpf/verifier/ctx_sk_lookup.c | 32 + + tools/testing/selftests/bpf/vmtest.sh | 48 +- + tools/testing/selftests/bpf/xdp_redirect_multi.c | 15 +- + tools/testing/selftests/bpf/xdping.c | 3 +- + tools/testing/selftests/bpf/xdpxceiver.c | 14 +- + .../drivers/net/mlxsw/devlink_trap_tunnel_vxlan.sh | 7 +- + .../net/mlxsw/devlink_trap_tunnel_vxlan_ipv6.sh | 342 + + .../net/mlxsw/spectrum-2/vxlan_flooding_ipv6.sh | 322 + + .../net/mlxsw/spectrum/vxlan_flooding_ipv6.sh | 334 + + tools/testing/selftests/drivers/net/mlxsw/vxlan.sh | 242 +- + .../selftests/drivers/net/mlxsw/vxlan_fdb_veto.sh | 39 +- + .../drivers/net/mlxsw/vxlan_fdb_veto_ipv6.sh | 12 + + .../selftests/drivers/net/mlxsw/vxlan_ipv6.sh | 65 + + tools/testing/selftests/net/fcnal-test.sh | 42 +- + .../selftests/net/forwarding/bridge_vlan_mcast.sh | 543 + + tools/testing/selftests/net/forwarding/lib.sh | 7 +- + .../selftests/net/forwarding/q_in_vni_ipv6.sh | 347 + + .../net/forwarding/vxlan_asymmetric_ipv6.sh | 504 + + .../net/forwarding/vxlan_bridge_1d_ipv6.sh | 804 ++ + .../forwarding/vxlan_bridge_1d_port_8472_ipv6.sh | 11 + + .../selftests/net/forwarding/vxlan_bridge_1q.sh | 20 - + .../net/forwarding/vxlan_bridge_1q_ipv6.sh | 837 ++ + .../forwarding/vxlan_bridge_1q_port_8472_ipv6.sh | 11 + + .../net/forwarding/vxlan_symmetric_ipv6.sh | 563 + + tools/testing/selftests/net/gro.c | 38 +- + tools/testing/selftests/net/mptcp/.gitignore | 1 + + tools/testing/selftests/net/mptcp/Makefile | 2 +- + tools/testing/selftests/net/mptcp/config | 8 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 206 +- + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 100 +- + tools/testing/selftests/net/mptcp/mptcp_inq.c | 602 + + tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 63 + + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 44 +- + tools/testing/selftests/net/nettest.c | 33 +- + .../tc-testing/tc-tests/actions/police.json | 24 + + .../tc-testing/tc-tests/filters/matchall.json | 72 + + 1790 files changed, 102289 insertions(+), 39014 deletions(-) + create mode 100644 Documentation/bpf/classic_vs_extended.rst + create mode 100644 Documentation/bpf/faq.rst + create mode 100644 Documentation/bpf/helpers.rst + create mode 100644 Documentation/bpf/instruction-set.rst + create mode 100644 Documentation/bpf/maps.rst + create mode 100644 Documentation/bpf/other.rst + rename Documentation/bpf/{bpf_lsm.rst => prog_lsm.rst} (100%) + create mode 100644 Documentation/bpf/programs.rst + create mode 100644 Documentation/bpf/syscall_api.rst + create mode 100644 Documentation/bpf/test_debug.rst + create mode 100644 Documentation/bpf/verifier.rst + create mode 100644 Documentation/devicetree/bindings/net/dsa/dsa-port.yaml + create mode 100644 Documentation/devicetree/bindings/net/engleder,tsnep.yaml + create mode 100644 Documentation/devicetree/bindings/net/intel,ixp4xx-hss.yaml + create mode 100644 Documentation/devicetree/bindings/net/microchip,lan966x-switch.yaml + create mode 100644 Documentation/devicetree/bindings/net/qcom,bam-dmux.yaml + create mode 100644 Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml + create mode 100644 drivers/bluetooth/btmtk.c + create mode 100644 drivers/bluetooth/btmtk.h + create mode 100644 drivers/net/ethernet/engleder/Kconfig + create mode 100644 drivers/net/ethernet/engleder/Makefile + create mode 100644 drivers/net/ethernet/engleder/tsnep.h + create mode 100644 drivers/net/ethernet/engleder/tsnep_ethtool.c + create mode 100644 drivers/net/ethernet/engleder/tsnep_hw.h + create mode 100644 drivers/net/ethernet/engleder/tsnep_main.c + create mode 100644 drivers/net/ethernet/engleder/tsnep_ptp.c + create mode 100644 drivers/net/ethernet/engleder/tsnep_selftests.c + create mode 100644 drivers/net/ethernet/engleder/tsnep_tc.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h + delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile + delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c + delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile + delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_cgu_regs.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_ptp_consts.h + delete mode 100644 drivers/net/ethernet/intel/ice/ice_status.h + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_counter.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_counter.h + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_router.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_router_hw.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_router_hw.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/accept.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/csum.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/drop.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/goto.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mark.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mirred.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mirred_nic.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mpls.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ptype.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/redirect_ingress.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/trap.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/tun.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan_mangle.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_dbg.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_dbg.h + create mode 100644 drivers/net/ethernet/microchip/lan966x/Kconfig + create mode 100644 drivers/net/ethernet/microchip/lan966x/Makefile + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_ifh.h + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_mac.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_main.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_main.h + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_phylink.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_port.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_regs.h + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c + create mode 100644 drivers/net/ethernet/microsoft/mana/mana_bpf.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_fdma.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_fdma.h + create mode 100644 drivers/net/ethernet/mscc/vsc7514_regs.c + create mode 100644 drivers/net/ethernet/vertexcom/Kconfig + create mode 100644 drivers/net/ethernet/vertexcom/Makefile + create mode 100644 drivers/net/ethernet/vertexcom/mse102x.c + create mode 100644 drivers/net/mctp/mctp-serial.c + rename drivers/net/wireless/intel/iwlwifi/fw/api/{soc.h => system.h} (70%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/Makefile + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/internal.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/main.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/net.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/sap.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/trace-data.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/trace.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/trace.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c + create mode 100644 drivers/net/wireless/realtek/rtw88/sar.c + create mode 100644 drivers/net/wireless/realtek/rtw88/sar.h + create mode 100644 drivers/net/wwan/iosm/iosm_ipc_debugfs.c + create mode 100644 drivers/net/wwan/iosm/iosm_ipc_debugfs.h + create mode 100644 drivers/net/wwan/iosm/iosm_ipc_trace.c + create mode 100644 drivers/net/wwan/iosm/iosm_ipc_trace.h + create mode 100644 drivers/net/wwan/qcom_bam_dmux.c + create mode 100644 include/linux/bpf-cgroup-defs.h + create mode 100644 include/linux/mdio/mdio-mscc-miim.h + create mode 100644 include/linux/ref_tracker.h + create mode 100644 include/net/bluetooth/hci_sync.h + create mode 100644 include/net/net_trackers.h + create mode 100644 include/net/netfilter/nf_conntrack_act_ct.h + create mode 100644 include/soc/mscc/vsc7514_regs.h + create mode 100644 kernel/bpf/mmap_unlock_work.h + create mode 100644 lib/ref_tracker.c + create mode 100644 lib/test_ref_tracker.c + create mode 100644 net/Kconfig.debug + create mode 100644 net/bluetooth/hci_sync.c + create mode 100644 net/core/dev_addr_lists_test.c + create mode 100644 net/core/gro.c + create mode 100644 tools/bpf/bpftool/Documentation/substitutions.rst + create mode 100644 tools/testing/selftests/bpf/benchs/bench_bpf_loop.c + create mode 100644 tools/testing/selftests/bpf/benchs/bench_strncmp.c + create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_bpf_loop.sh + create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_strncmp.sh + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_loop.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_kern.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/exhandler.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/find_vma.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/get_func_args_test.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/legacy_printk.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/libbpf_probes.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/log_buf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/prog_array_init.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_strncmp.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_loop.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_loop_bench.c + rename tools/testing/selftests/bpf/progs/{tag.c => btf_decl_tag.c} (94%) + create mode 100644 tools/testing/selftests/bpf/progs/btf_type_tag.c + create mode 100644 tools/testing/selftests/bpf/progs/core_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/exhandler_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/find_vma.c + create mode 100644 tools/testing/selftests/bpf/progs/find_vma_fail1.c + create mode 100644 tools/testing/selftests/bpf/progs/find_vma_fail2.c + create mode 100644 tools/testing/selftests/bpf/progs/get_func_args_test.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf600_bpf_loop.c + create mode 100644 tools/testing/selftests/bpf/progs/strncmp_bench.c + create mode 100644 tools/testing/selftests/bpf/progs/strncmp_test.c + create mode 100644 tools/testing/selftests/bpf/progs/strobemeta_bpf_loop.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ksyms_btf_write_check.c + create mode 100644 tools/testing/selftests/bpf/progs/test_legacy_printk.c + create mode 100644 tools/testing/selftests/bpf/progs/test_log_buf.c + create mode 100644 tools/testing/selftests/bpf/progs/test_prog_array_init.c + delete mode 100644 tools/testing/selftests/bpf/test_stub.c + create mode 100644 tools/testing/selftests/bpf/verifier/btf_ctx_access.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_trap_tunnel_vxlan_ipv6.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/vxlan_flooding_ipv6.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/spectrum/vxlan_flooding_ipv6.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/vxlan_fdb_veto_ipv6.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/vxlan_ipv6.sh + create mode 100755 tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh + create mode 100755 tools/testing/selftests/net/forwarding/q_in_vni_ipv6.sh + create mode 100755 tools/testing/selftests/net/forwarding/vxlan_asymmetric_ipv6.sh + create mode 100755 tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh + create mode 100755 tools/testing/selftests/net/forwarding/vxlan_bridge_1d_port_8472_ipv6.sh + create mode 100755 tools/testing/selftests/net/forwarding/vxlan_bridge_1q_ipv6.sh + create mode 100755 tools/testing/selftests/net/forwarding/vxlan_bridge_1q_port_8472_ipv6.sh + create mode 100755 tools/testing/selftests/net/forwarding/vxlan_symmetric_ipv6.sh + create mode 100644 tools/testing/selftests/net/mptcp/mptcp_inq.c +Merging bpf-next/for-next (e63a02348958 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (4e484b3e969b xfrm: rate limit SA mapping change message to user space) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/xfrm/xfrm_state.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/ipv6/esp6.c +Auto-merging include/net/xfrm.h +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 5 +++++ + include/uapi/linux/pfkeyv2.h | 2 ++ + include/uapi/linux/xfrm.h | 1 + + net/ipv6/esp6.c | 3 +-- + net/xfrm/xfrm_algo.c | 41 +++++++++++++++++++++++++++++++++++++++++ + net/xfrm/xfrm_compat.c | 6 ++++-- + net/xfrm/xfrm_input.c | 1 + + net/xfrm/xfrm_output.c | 1 + + net/xfrm/xfrm_policy.c | 3 +-- + net/xfrm/xfrm_state.c | 23 ++++++++++++++++++++++- + net/xfrm/xfrm_user.c | 18 +++++++++++++++++- + 11 files changed, 96 insertions(+), 8 deletions(-) +Merging mlx5-next/mlx5-next (685b1afd7911 net/mlx5: Introduce log_max_current_uc_list_wr_supported bit) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (2b71e2c7b56c netfilter: nft_set_pipapo_avx2: remove redundant pointer lt) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Auto-merging net/netfilter/nfnetlink_log.c +Auto-merging net/netfilter/nf_conntrack_core.c +Merge made by the 'recursive' strategy. + include/net/netfilter/nf_conntrack.h | 1 + + include/net/netfilter/nf_tables_core.h | 6 +++ + net/ipv4/netfilter/Kconfig | 8 +--- + net/ipv4/netfilter/Makefile | 3 -- + net/ipv4/netfilter/nf_flow_table_ipv4.c | 37 ------------------ + net/ipv6/netfilter/Kconfig | 8 +--- + net/ipv6/netfilter/nf_flow_table_ipv6.c | 38 ------------------ + net/netfilter/Kconfig | 6 --- + net/netfilter/Makefile | 3 +- + net/netfilter/nf_conntrack_core.c | 3 ++ + net/netfilter/nf_flow_table_inet.c | 26 +++++++++++++ + net/netfilter/nf_nat_core.c | 43 +++++++++++++++++++-- + net/netfilter/nf_nat_masquerade.c | 4 +- + net/netfilter/nf_tables_core.c | 48 ++++++++++++++++++----- + net/netfilter/nfnetlink_log.c | 5 ++- + net/netfilter/nft_counter.c | 58 +++++++--------------------- + net/netfilter/nft_payload.c | 6 ++- + net/netfilter/nft_set_pipapo_avx2.c | 4 +- + tools/testing/selftests/netfilter/nft_nat.sh | 5 ++- + 19 files changed, 148 insertions(+), 164 deletions(-) +Merging ipvs-next/master (2b71e2c7b56c netfilter: nft_set_pipapo_avx2: remove redundant pointer lt) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (d430dffbe9dd mt76: mt7921: fix a possible race enabling/disabling runtime-pm) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (5d1dd2e5a681 Bluetooth: MGMT: Fix spelling mistake "simultanous" -> "simultaneous") +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Already up to date. +Merging mac80211-next/master (18343b806915 Merge tag 'mac80211-next-for-net-next-2022-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git mac80211-next/master +Already up to date. +Merging mtd/mtd/next (9ce47e43a0f0 Merge tag 'nand/for-5.17' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Removing include/linux/mtd/latch-addr-flash.h +Auto-merging drivers/mtd/nand/raw/nand_base.c +Auto-merging drivers/mtd/nand/raw/Kconfig +Auto-merging drivers/mtd/hyperbus/rpc-if.c +Auto-merging drivers/mtd/devices/mtd_dataflash.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/renesas-nandc.yaml | 61 + + .../devicetree/bindings/mtd/ti,gpmc-nand.yaml | 10 +- + MAINTAINERS | 10 +- + drivers/mtd/chips/gen_probe.c | 9 +- + drivers/mtd/devices/mchp23k256.c | 4 +- + drivers/mtd/devices/mchp48l640.c | 4 +- + drivers/mtd/devices/mtd_dataflash.c | 10 +- + drivers/mtd/devices/sst25l.c | 4 +- + drivers/mtd/hyperbus/rpc-if.c | 8 +- + drivers/mtd/mtdchar.c | 110 +- + drivers/mtd/mtdcore.c | 21 +- + drivers/mtd/mtdpart.c | 2 +- + drivers/mtd/nand/core.c | 3 + + drivers/mtd/nand/onenand/onenand_bbt.c | 4 +- + drivers/mtd/nand/raw/Kconfig | 9 +- + drivers/mtd/nand/raw/Makefile | 1 + + drivers/mtd/nand/raw/davinci_nand.c | 73 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 53 +- + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 5 + + drivers/mtd/nand/raw/mpc5121_nfc.c | 1 - + drivers/mtd/nand/raw/nand_base.c | 70 + + drivers/mtd/nand/raw/nand_bbt.c | 3 + + drivers/mtd/nand/raw/omap2.c | 502 +++---- + drivers/mtd/nand/raw/omap_elm.c | 16 +- + drivers/mtd/nand/raw/renesas-nand-controller.c | 1424 ++++++++++++++++++++ + drivers/mtd/spi-nor/atmel.c | 79 +- + drivers/mtd/spi-nor/catalyst.c | 15 +- + drivers/mtd/spi-nor/core.c | 556 ++++---- + drivers/mtd/spi-nor/core.h | 217 +-- + drivers/mtd/spi-nor/eon.c | 33 +- + drivers/mtd/spi-nor/esmt.c | 15 +- + drivers/mtd/spi-nor/everspin.c | 12 +- + drivers/mtd/spi-nor/fujitsu.c | 3 +- + drivers/mtd/spi-nor/gigadevice.c | 59 +- + drivers/mtd/spi-nor/intel.c | 12 +- + drivers/mtd/spi-nor/issi.c | 62 +- + drivers/mtd/spi-nor/macronix.c | 107 +- + drivers/mtd/spi-nor/micron-st.c | 234 ++-- + drivers/mtd/spi-nor/otp.c | 2 +- + drivers/mtd/spi-nor/sfdp.c | 20 + + drivers/mtd/spi-nor/spansion.c | 184 +-- + drivers/mtd/spi-nor/sst.c | 96 +- + drivers/mtd/spi-nor/swp.c | 2 +- + drivers/mtd/spi-nor/winbond.c | 168 ++- + drivers/mtd/spi-nor/xilinx.c | 21 +- + drivers/mtd/spi-nor/xmc.c | 10 +- + include/linux/mtd/latch-addr-flash.h | 29 - + include/linux/mtd/mtd.h | 3 + + include/linux/mtd/rawnand.h | 2 + + include/linux/mtd/spi-nor.h | 2 - + include/linux/platform_data/mtd-nand-omap2.h | 1 + + 51 files changed, 3068 insertions(+), 1293 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/renesas-nandc.yaml + create mode 100644 drivers/mtd/nand/raw/renesas-nand-controller.c + delete mode 100644 include/linux/mtd/latch-addr-flash.h +Merging nand/nand/next (2997e4871621 Merge tag 'memory-controller-drv-omap-5.17' into nand/next) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (5f340402bbfc mtd: spi-nor: Remove debugfs entries that duplicate sysfs entries) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (4cab5dfd15b7 crypto: qat - fix definition of ring reset results) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Removing drivers/crypto/qat/qat_common/adf_vf2pf_msg.c +Removing drivers/crypto/qat/qat_common/adf_pf2vf_msg.h +Removing drivers/crypto/qat/qat_common/adf_pf2vf_msg.c +Auto-merging drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c +CONFLICT (content): Merge conflict in drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c +Auto-merging drivers/char/hw_random/Makefile +Auto-merging drivers/char/hw_random/Kconfig +Auto-merging MAINTAINERS +Resolved 'drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d7532de069a7] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/amd-memory-encryption.rst | 6 + + MAINTAINERS | 3 +- + arch/mips/cavium-octeon/crypto/octeon-sha1.c | 17 +- + arch/mips/cavium-octeon/crypto/octeon-sha256.c | 39 +- + arch/mips/cavium-octeon/crypto/octeon-sha512.c | 39 +- + arch/powerpc/crypto/sha1-spe-glue.c | 17 +- + arch/powerpc/crypto/sha1.c | 14 +- + arch/powerpc/crypto/sha256-spe-glue.c | 39 +- + arch/s390/crypto/sha512_s390.c | 32 +- + arch/sparc/crypto/sha1_glue.c | 14 +- + arch/sparc/crypto/sha256_glue.c | 37 +- + arch/sparc/crypto/sha512_glue.c | 37 +- + arch/x86/crypto/aesni-intel_glue.c | 4 +- + arch/x86/crypto/curve25519-x86_64.c | 767 ++++++++++------ + arch/x86/crypto/des3_ede_glue.c | 4 +- + crypto/Kconfig | 4 + + crypto/Makefile | 5 + + crypto/dh.c | 5 +- + crypto/drbg.c | 150 ++-- + crypto/jitterentropy-kcapi.c | 6 - + crypto/jitterentropy.c | 32 +- + crypto/jitterentropy.h | 1 - + crypto/kdf_sp800108.c | 153 ++++ + crypto/rsa.c | 4 + + crypto/sha256_generic.c | 16 +- + crypto/testmgr.c | 9 - + crypto/testmgr.h | 6 +- + drivers/char/hw_random/Kconfig | 13 +- + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/cavium-rng-vf.c | 194 +++- + drivers/char/hw_random/cavium-rng.c | 11 +- + drivers/char/hw_random/cn10k-rng.c | 181 ++++ + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 21 + + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 1 + + drivers/crypto/atmel-aes.c | 6 +- + drivers/crypto/caam/caamalg.c | 6 + + drivers/crypto/caam/caamalg_qi2.c | 2 +- + drivers/crypto/caam/caamhash.c | 3 + + drivers/crypto/caam/caampkc.c | 3 + + drivers/crypto/cavium/cpt/cptvf_main.c | 5 +- + drivers/crypto/ccp/ccp-dev.c | 2 +- + drivers/crypto/ccp/sev-dev.c | 259 +++++- + drivers/crypto/ccree/cc_request_mgr.c | 1 - + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 7 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 2 +- + drivers/crypto/hisilicon/qm.c | 483 ++++++---- + drivers/crypto/hisilicon/sec2/sec_main.c | 2 +- + drivers/crypto/hisilicon/zip/zip_main.c | 12 +- + drivers/crypto/keembay/keembay-ocs-ecc.c | 1 + + drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 4 +- + drivers/crypto/marvell/octeontx2/Makefile | 2 +- + drivers/crypto/marvell/octeontx2/otx2_cpt_common.h | 1 + + .../crypto/marvell/octeontx2/otx2_cpt_devlink.c | 108 +++ + .../crypto/marvell/octeontx2/otx2_cpt_devlink.h | 20 + + drivers/crypto/marvell/octeontx2/otx2_cptpf.h | 3 + + drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 18 +- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 315 ++++++- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.h | 7 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 5 +- + drivers/crypto/omap-aes.c | 2 +- + drivers/crypto/omap-des.c | 8 +- + drivers/crypto/qat/Kconfig | 1 + + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 154 +++- + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h | 2 + + drivers/crypto/qat/qat_4xxx/adf_drv.c | 33 + + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 12 +- + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 15 +- + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h | 1 - + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 6 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 12 +- + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 15 +- + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.h | 1 - + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 6 +- + drivers/crypto/qat/qat_common/Makefile | 6 +- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 47 +- + drivers/crypto/qat/qat_common/adf_accel_engine.c | 8 +- + drivers/crypto/qat/qat_common/adf_admin.c | 47 +- + drivers/crypto/qat/qat_common/adf_cfg.c | 1 + + drivers/crypto/qat/qat_common/adf_cfg_common.h | 13 + + drivers/crypto/qat/qat_common/adf_cfg_strings.h | 3 + + drivers/crypto/qat/qat_common/adf_common_drv.h | 42 +- + drivers/crypto/qat/qat_common/adf_gen2_hw_data.c | 105 +-- + drivers/crypto/qat/qat_common/adf_gen2_hw_data.h | 22 +- + drivers/crypto/qat/qat_common/adf_gen2_pfvf.c | 381 ++++++++ + drivers/crypto/qat/qat_common/adf_gen2_pfvf.h | 29 + + drivers/crypto/qat/qat_common/adf_gen4_hw_data.c | 69 +- + drivers/crypto/qat/qat_common/adf_gen4_hw_data.h | 17 + + drivers/crypto/qat/qat_common/adf_gen4_pfvf.c | 148 +++ + drivers/crypto/qat/qat_common/adf_gen4_pfvf.h | 17 + + drivers/crypto/qat/qat_common/adf_init.c | 11 +- + drivers/crypto/qat/qat_common/adf_isr.c | 111 ++- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 416 --------- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.h | 93 -- + drivers/crypto/qat/qat_common/adf_pfvf_msg.h | 259 ++++++ + drivers/crypto/qat/qat_common/adf_pfvf_pf_msg.c | 52 ++ + drivers/crypto/qat/qat_common/adf_pfvf_pf_msg.h | 18 + + drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c | 346 ++++++++ + drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.h | 13 + + drivers/crypto/qat/qat_common/adf_pfvf_utils.c | 65 ++ + drivers/crypto/qat/qat_common/adf_pfvf_utils.h | 31 + + drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.c | 167 ++++ + drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.h | 23 + + drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c | 368 ++++++++ + drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.h | 17 + + drivers/crypto/qat/qat_common/adf_sriov.c | 59 +- + drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 48 - + drivers/crypto/qat/qat_common/adf_vf_isr.c | 106 +-- + .../crypto/qat/qat_common/icp_qat_fw_init_admin.h | 4 +- + drivers/crypto/qat/qat_common/icp_qat_hw.h | 13 +- + drivers/crypto/qat/qat_common/qat_crypto.c | 25 + + drivers/crypto/qat/qat_common/qat_hal.c | 41 +- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 44 +- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 2 + + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 15 +- + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h | 1 - + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 6 +- + drivers/crypto/qce/aead.c | 2 +- + drivers/crypto/qce/sha.c | 2 +- + drivers/crypto/qce/skcipher.c | 2 +- + drivers/crypto/sa2ul.c | 19 +- + drivers/crypto/stm32/stm32-crc32.c | 4 +- + drivers/crypto/stm32/stm32-cryp.c | 988 +++++++++------------ + drivers/crypto/stm32/stm32-hash.c | 6 +- + drivers/crypto/ux500/cryp/cryp.h | 2 + + drivers/crypto/ux500/cryp/cryp_core.c | 26 +- + include/crypto/aead.h | 4 +- + include/crypto/algapi.h | 5 +- + include/crypto/blake2b.h | 1 - + include/crypto/blake2s.h | 2 +- + include/crypto/cryptd.h | 3 +- + include/crypto/drbg.h | 11 +- + include/crypto/engine.h | 6 +- + include/crypto/internal/kdf_selftest.h | 71 ++ + include/crypto/kdf_sp800108.h | 61 ++ + include/crypto/pcrypt.h | 2 +- + include/crypto/scatterwalk.h | 3 +- + include/crypto/skcipher.h | 6 +- + include/linux/psp-sev.h | 21 + + security/keys/Kconfig | 2 +- + security/keys/dh.c | 130 +-- + 140 files changed, 5475 insertions(+), 2640 deletions(-) + create mode 100644 crypto/kdf_sp800108.c + create mode 100644 drivers/char/hw_random/cn10k-rng.c + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_devlink.c + create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_devlink.h + create mode 100644 drivers/crypto/qat/qat_common/adf_gen2_pfvf.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen2_pfvf.h + create mode 100644 drivers/crypto/qat/qat_common/adf_gen4_pfvf.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen4_pfvf.h + delete mode 100644 drivers/crypto/qat/qat_common/adf_pf2vf_msg.c + delete mode 100644 drivers/crypto/qat/qat_common/adf_pf2vf_msg.h + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_msg.h + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_pf_msg.c + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_pf_msg.h + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.h + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_utils.c + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_utils.h + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.c + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.h + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.h + delete mode 100644 drivers/crypto/qat/qat_common/adf_vf2pf_msg.c + create mode 100644 include/crypto/internal/kdf_selftest.h + create mode 100644 include/crypto/kdf_sp800108.h +Merging drm/drm-next (cb6846fbb83b Merge tag 'amd-drm-next-5.17-2021-12-30' of ssh://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Removing drivers/gpu/drm/vmwgfx/vmwgfx_thp.c +Removing drivers/gpu/drm/vmwgfx/ttm_memory.h +Removing drivers/gpu/drm/vmwgfx/ttm_memory.c +Auto-merging drivers/gpu/drm/tiny/simpledrm.c +Removing drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h +Removing drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_fence.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nouveau_fence.c +Removing drivers/gpu/drm/msm/edp/edp_phy.c +Removing drivers/gpu/drm/msm/edp/edp_ctrl.c +Removing drivers/gpu/drm/msm/edp/edp_connector.c +Removing drivers/gpu/drm/msm/edp/edp_bridge.c +Removing drivers/gpu/drm/msm/edp/edp_aux.c +Removing drivers/gpu/drm/msm/edp/edp.xml.h +Removing drivers/gpu/drm/msm/edp/edp.h +Removing drivers/gpu/drm/msm/edp/edp.c +Removing drivers/gpu/drm/meson/meson_venc_cvbs.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Removing drivers/gpu/drm/i915/dma_resv_utils.h +Removing drivers/gpu/drm/i915/dma_resv_utils.c +Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/ast/ast_mode.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging MAINTAINERS +Removing Documentation/gpu/amdgpu.rst +Removing Documentation/gpu/amdgpu-dc.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/display/msm/edp.txt +Removing Documentation/devicetree/bindings/display/bridge/sii9234.txt +Removing Documentation/devicetree/bindings/display/bridge/ptn3460.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging .mailmap +Resolved 'drivers/gpu/drm/nouveau/nouveau_fence.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8cf0f7b0680c] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 8 + + Documentation/admin-guide/kernel-parameters.txt | 7 + + .../bindings/display/bridge/analogix,anx7625.yaml | 65 +- + .../bindings/display/bridge/lvds-codec.yaml | 43 +- + .../bindings/display/bridge/nxp,ptn3460.yaml | 106 ++ + .../devicetree/bindings/display/bridge/ptn3460.txt | 39 - + .../display/bridge/renesas,dsi-csi2-tx.yaml | 118 ++ + .../devicetree/bindings/display/bridge/sii9234.txt | 49 - + .../bindings/display/bridge/sil,sii9234.yaml | 110 ++ + .../bindings/display/msm/dp-controller.yaml | 2 + + .../devicetree/bindings/display/msm/edp.txt | 56 - + .../bindings/display/panel/boe,bf060y8m-aj0.yaml | 81 + + .../bindings/display/panel/ilitek,ili9163.yaml | 69 + + .../bindings/display/panel/ilitek,ili9881c.yaml | 6 +- + .../bindings/display/panel/novatek,nt35950.yaml | 106 ++ + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../display/panel/sony,tulip-truly-nt35521.yaml | 72 + + .../display/sprd/sprd,display-subsystem.yaml | 64 + + .../bindings/display/sprd/sprd,sharkl3-dpu.yaml | 77 + + .../display/sprd/sprd,sharkl3-dsi-host.yaml | 88 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/gpu/amdgpu-dc.rst | 74 - + Documentation/gpu/amdgpu.rst | 324 ---- + Documentation/gpu/amdgpu/amdgpu-glossary.rst | 87 + + .../gpu/amdgpu/display/config_example.svg | 414 ++++ + Documentation/gpu/amdgpu/display/dc-debug.rst | 77 + + Documentation/gpu/amdgpu/display/dc-glossary.rst | 237 +++ + .../gpu/amdgpu/display/dc_pipeline_overview.svg | 1125 +++++++++++ + Documentation/gpu/amdgpu/display/dcn-overview.rst | 171 ++ + .../gpu/amdgpu/display/display-manager.rst | 42 + + .../gpu/amdgpu/display/global_sync_vblank.svg | 485 +++++ + Documentation/gpu/amdgpu/display/index.rst | 31 + + Documentation/gpu/amdgpu/driver-core.rst | 182 ++ + Documentation/gpu/amdgpu/driver-misc.rst | 112 ++ + Documentation/gpu/amdgpu/index.rst | 17 + + Documentation/gpu/amdgpu/module-parameters.rst | 7 + + Documentation/gpu/amdgpu/ras.rst | 62 + + Documentation/gpu/amdgpu/thermal.rst | 65 + + Documentation/gpu/amdgpu/xgmi.rst | 5 + + Documentation/gpu/drivers.rst | 3 +- + Documentation/gpu/drm-kms-helpers.rst | 15 + + Documentation/gpu/drm-kms.rst | 2 + + Documentation/gpu/todo.rst | 37 +- + MAINTAINERS | 23 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/char/agp/intel-gtt.c | 1 + + drivers/clk/bcm/clk-bcm2835.c | 13 +- + drivers/dma-buf/Makefile | 3 +- + drivers/dma-buf/dma-buf.c | 32 +- + drivers/dma-buf/dma-fence-array.c | 6 +- + drivers/dma-buf/dma-fence.c | 17 + + drivers/dma-buf/dma-resv.c | 26 +- + drivers/dma-buf/selftests.h | 1 + + drivers/dma-buf/st-dma-resv.c | 371 ++++ + drivers/gpu/drm/Kconfig | 23 +- + drivers/gpu/drm/Makefile | 32 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 138 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 97 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 18 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 126 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 143 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 128 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 124 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 155 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 218 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 185 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 110 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 388 ---- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ioc32.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 20 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 19 + + drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 169 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 57 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 68 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 5 + + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 - + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 117 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 86 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 5 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 2 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 5 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 78 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 2 - + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 85 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 11 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 5 + + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 161 ++ + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 1 + + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 1 + + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 54 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 148 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 998 +++------- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 144 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 5 + + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 31 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 46 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 35 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 20 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 66 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 325 ++-- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 98 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 46 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 324 +++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 7 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 4 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 217 ++- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 52 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 101 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 6 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 6 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 3 +- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 2 +- + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 2 + + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 43 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 26 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 6 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 44 +- + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 6 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 22 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 15 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h | 7 + + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 6 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 186 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 338 +++- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 1074 ++++++++++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c | 68 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 53 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 63 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 186 +- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 10 +- + drivers/gpu/drm/amd/display/dc/dc.h | 35 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 37 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 40 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 27 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 2 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 6 - + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 2 + + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 5 +- + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 3 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 14 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 2 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 66 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 8 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 111 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 125 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 30 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 20 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 38 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 15 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 14 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 18 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 4 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 71 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 3 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 5 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 2 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_dccg.c | 3 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubp.c | 7 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 3 +- + .../amd/display/dc/dcn201/dcn201_link_encoder.c | 6 +- + .../drm/amd/display/dc/dcn201/dcn201_resource.c | 16 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 15 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 2 + + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 9 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 33 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 20 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 36 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 50 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 5 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 3 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 1 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 16 +- + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 2 + + .../drm/amd/display/dc/dcn301/dcn301_panel_cntl.c | 10 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 66 +- + .../gpu/drm/amd/display/dc/dcn302/dcn302_init.c | 2 + + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 20 +- + .../gpu/drm/amd/display/dc/dcn303/dcn303_dccg.h | 20 +- + .../gpu/drm/amd/display/dc/dcn303/dcn303_init.c | 2 + + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 19 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 2 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 99 +- + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 6 +- + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.h | 3 +- + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 43 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 7 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 1 + + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 10 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 24 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 8 - + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 489 ++--- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 + + drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c | 1889 ++++++++++++++++++ + .../amd/display/dc/dml/dml_wrapper_translation.c | 284 +++ + .../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 33 +- + .../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.h | 4 - + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 14 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 28 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 1 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 6 +- + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 18 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 17 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dml_wrapper.h | 34 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 7 + + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 4 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 10 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 17 +- + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 10 +- + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 7 +- + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 7 +- + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 7 +- + .../amd/display/dc/irq/dcn31/irq_service_dcn31.c | 7 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 42 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 61 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 89 +- + .../drm/amd/display/include/ddc_service_types.h | 4 + + drivers/gpu/drm/amd/display/include/logger_types.h | 4 - + drivers/gpu/drm/amd/include/amd_shared.h | 2 + + .../drm/amd/include/asic_reg/mp/mp_11_0_offset.h | 7 + + .../drm/amd/include/asic_reg/mp/mp_11_0_sh_mask.h | 12 + + .../amd/include/asic_reg/nbio/nbio_7_2_0_offset.h | 2 - + .../amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h | 12 - + .../gpu/drm/amd/include/cyan_skillfish_ip_offset.h | 10 +- + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 57 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 4 + + drivers/gpu/drm/amd/include/yellow_carp_offset.h | 4 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 21 +- + drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 4 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 8 + + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 31 +- + .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 18 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 3 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 5 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 9 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 14 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 12 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 143 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 22 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 10 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 87 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 132 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 37 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 34 +- + drivers/gpu/drm/arm/Kconfig | 2 - + drivers/gpu/drm/arm/display/Kconfig | 1 - + drivers/gpu/drm/aspeed/Kconfig | 2 +- + drivers/gpu/drm/ast/Makefile | 2 +- + drivers/gpu/drm/ast/ast_drv.c | 3 +- + drivers/gpu/drm/ast/ast_drv.h | 3 + + drivers/gpu/drm/ast/ast_i2c.c | 152 ++ + drivers/gpu/drm/ast/ast_mode.c | 151 +- + drivers/gpu/drm/atmel-hlcdc/Kconfig | 1 - + drivers/gpu/drm/bridge/Kconfig | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 - + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 15 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 20 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 14 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 495 ++++- + drivers/gpu/drm/bridge/analogix/anx7625.h | 23 +- + drivers/gpu/drm/bridge/display-connector.c | 88 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 31 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 66 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 65 +- + drivers/gpu/drm/bridge/lvds-codec.c | 36 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 40 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 347 ++-- + .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 10 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 4 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 9 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 13 +- + drivers/gpu/drm/bridge/tc358768.c | 94 +- + drivers/gpu/drm/bridge/tc358775.c | 50 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 128 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 475 ++++- + drivers/gpu/drm/drm_atomic.c | 180 +- + drivers/gpu/drm/drm_atomic_helper.c | 243 +-- + drivers/gpu/drm/drm_atomic_uapi.c | 6 +- + drivers/gpu/drm/drm_auth.c | 12 +- + drivers/gpu/drm/drm_connector.c | 205 +- + drivers/gpu/drm/drm_dp_helper.c | 261 ++- + drivers/gpu/drm/drm_drv.c | 13 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/drm_format_helper.c | 311 +-- + drivers/gpu/drm/drm_fourcc.c | 3 + + drivers/gpu/drm/drm_gem_atomic_helper.c | 14 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 95 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 153 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 4 +- + drivers/gpu/drm/drm_hashtab.c | 10 +- + drivers/gpu/drm/drm_irq.c | 2 - + drivers/gpu/drm/drm_legacy.h | 40 +- + drivers/gpu/drm/drm_mipi_dbi.c | 40 +- + drivers/gpu/drm/drm_nomodeset.c | 24 + + drivers/gpu/drm/drm_of.c | 33 + + drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 + + drivers/gpu/drm/drm_privacy_screen.c | 467 +++++ + drivers/gpu/drm/drm_privacy_screen_x86.c | 86 + + drivers/gpu/drm/drm_probe_helper.c | 48 +- + drivers/gpu/drm/drm_sysfs.c | 25 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 41 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 33 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 10 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 13 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 49 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 20 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 43 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 5 - + drivers/gpu/drm/fsl-dcu/Kconfig | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 52 +- + drivers/gpu/drm/gma500/gem.c | 234 ++- + drivers/gpu/drm/gma500/gem.h | 28 +- + drivers/gpu/drm/gma500/gma_display.c | 51 +- + drivers/gpu/drm/gma500/gtt.c | 326 +--- + drivers/gpu/drm/gma500/gtt.h | 29 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 3 +- + drivers/gpu/drm/gma500/psb_drv.c | 12 + + drivers/gpu/drm/gma500/psb_intel_display.c | 17 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 2 +- + drivers/gpu/drm/gud/gud_pipe.c | 14 +- + drivers/gpu/drm/hisilicon/kirin/Kconfig | 1 - + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 52 +- + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 5 +- + drivers/gpu/drm/i915/Kconfig | 2 +- + drivers/gpu/drm/i915/Makefile | 9 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 1 + + drivers/gpu/drm/i915/display/g4x_hdmi.c | 1 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 141 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 10 +- + drivers/gpu/drm/i915/display/icl_dsi.h | 15 + + drivers/gpu/drm/i915/display/intel_atomic.c | 1 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 107 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 23 +- + drivers/gpu/drm/i915/display/intel_audio.c | 143 +- + drivers/gpu/drm/i915/display/intel_audio.h | 4 +- + drivers/gpu/drm/i915/display/intel_bios.c | 14 +- + drivers/gpu/drm/i915/display/intel_bw.c | 215 ++- + drivers/gpu/drm/i915/display/intel_cdclk.c | 205 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 10 +- + drivers/gpu/drm/i915/display/intel_color.c | 153 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_crt.c | 19 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 155 +- + drivers/gpu/drm/i915/display/intel_crtc.h | 14 + + drivers/gpu/drm/i915/display/intel_cursor.c | 69 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 364 ++-- + drivers/gpu/drm/i915/display/intel_ddi.h | 5 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 94 +- + drivers/gpu/drm/i915/display/intel_display.c | 2009 ++++---------------- + drivers/gpu/drm/i915/display/intel_display.h | 47 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 111 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 136 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 102 +- + drivers/gpu/drm/i915/display/intel_display_trace.c | 9 + + drivers/gpu/drm/i915/display/intel_display_trace.h | 587 ++++++ + drivers/gpu/drm/i915/display/intel_display_types.h | 127 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 8 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 2 + + drivers/gpu/drm/i915/display/intel_dp.c | 166 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 61 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 45 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 32 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 7 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 2 +- + drivers/gpu/drm/i915/display/intel_dpt.c | 62 +- + drivers/gpu/drm/i915/display/intel_dpt.h | 4 + + drivers/gpu/drm/i915/display/intel_dsb.c | 4 +- + drivers/gpu/drm/i915/display/intel_dsi.c | 2 + + drivers/gpu/drm/i915/display/intel_dsi.h | 42 - + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 4 + + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 + + drivers/gpu/drm/i915/display/intel_dsi_vbt.h | 22 + + drivers/gpu/drm/i915/display/intel_fb.c | 717 +++++-- + drivers/gpu/drm/i915/display/intel_fb.h | 33 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 22 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 1831 ++++++++++-------- + drivers/gpu/drm/i915/display/intel_fbc.h | 17 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 141 +- + drivers/gpu/drm/i915/display/intel_fdi.h | 2 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 12 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 7 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.h | 2 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 13 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 117 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 42 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 501 +++++ + drivers/gpu/drm/i915/display/intel_pch_display.h | 27 + + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 648 +++++++ + drivers/gpu/drm/i915/display/intel_pch_refclk.h | 21 + + drivers/gpu/drm/i915/display/intel_plane_initial.c | 5 +- + drivers/gpu/drm/i915/display/intel_psr.c | 125 +- + drivers/gpu/drm/i915/display/intel_psr.h | 14 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 1 + + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 4 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 289 +-- + drivers/gpu/drm/i915/display/intel_sprite.h | 4 - + drivers/gpu/drm/i915/display/intel_tv.c | 8 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 7 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 82 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 10 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 18 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 1 + + drivers/gpu/drm/i915/display/skl_scaler.c | 1 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 511 ++--- + drivers/gpu/drm/i915/display/vlv_dsi.c | 8 + + drivers/gpu/drm/i915/display/vlv_dsi.h | 19 + + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 1 + + drivers/gpu/drm/i915/display/vlv_dsi_pll.h | 38 + + drivers/gpu/drm/i915/dma_resv_utils.c | 17 - + drivers/gpu/drm/i915/dma_resv_utils.h | 13 - + drivers/gpu/drm/i915/gem/i915_gem_busy.c | 35 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 18 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 26 +- + drivers/gpu/drm/i915/gem/i915_gem_create.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 22 + + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 195 +- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 44 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 11 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 92 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 48 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 46 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 21 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_region.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 195 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 137 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 19 +- + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 765 ++++---- + drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 41 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 627 ++++++ + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.h | 41 + + drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c | 3 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 106 +- + drivers/gpu/drm/i915/gem/i915_gemfs.c | 5 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 134 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 2 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 71 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 4 +- + .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 26 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 26 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 151 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.h | 2 - + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 34 +- + drivers/gpu/drm/i915/gt/intel_context.c | 16 +- + drivers/gpu/drm/i915/gt/intel_context.h | 3 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 1 + + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 68 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 40 +- + drivers/gpu/drm/i915/gt/intel_engine_stats.h | 33 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 84 +- + drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 37 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 430 +---- + drivers/gpu/drm/i915/gt/intel_gt.c | 13 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 1 + + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 7 +- + drivers/gpu/drm/i915/gt/intel_gt_debugfs.h | 21 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 30 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 14 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 5 + + drivers/gpu/drm/i915/gt/intel_migrate.c | 32 +- + drivers/gpu/drm/i915/gt/intel_migrate.h | 9 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 12 - + drivers/gpu/drm/i915/gt/intel_rc6.c | 15 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 17 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 60 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 143 +- + drivers/gpu/drm/i915/gt/intel_rps.h | 5 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 477 ++++- + drivers/gpu/drm/i915/gt/mock_engine.c | 50 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_engine.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 4 +- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 35 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 6 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 12 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 22 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_migrate.c | 7 +- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_ring_submission.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_slpc.c | 6 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 6 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 4 +- + drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 42 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 21 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h | 5 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 18 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 33 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 13 + + drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 5 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c | 62 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 157 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 13 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 367 +++- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 2 + + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 75 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.h | 2 - + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 11 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 188 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 18 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 175 +- + .../gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c | 2 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 2 +- + drivers/gpu/drm/i915/gvt/gtt.c | 12 +- + drivers/gpu/drm/i915/gvt/gvt.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- + drivers/gpu/drm/i915/i915_active.c | 28 +- + drivers/gpu/drm/i915/i915_active.h | 17 +- + drivers/gpu/drm/i915/i915_active_types.h | 2 - + drivers/gpu/drm/i915/i915_debugfs.c | 43 +- + drivers/gpu/drm/i915/i915_debugfs_params.c | 4 +- + drivers/gpu/drm/i915/i915_deps.c | 237 +++ + drivers/gpu/drm/i915/i915_deps.h | 45 + + drivers/gpu/drm/i915/{i915_drv.c => i915_driver.c} | 93 +- + drivers/gpu/drm/i915/i915_driver.h | 24 + + drivers/gpu/drm/i915/i915_drv.h | 388 +--- + drivers/gpu/drm/i915/i915_gem.c | 51 +- + drivers/gpu/drm/i915/i915_getparam.c | 10 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 234 ++- + drivers/gpu/drm/i915/i915_gpu_error.h | 4 +- + drivers/gpu/drm/i915/i915_iosf_mbi.h | 42 + + drivers/gpu/drm/i915/i915_irq.c | 84 +- + drivers/gpu/drm/i915/i915_mm.c | 28 +- + drivers/gpu/drm/i915/i915_mm.h | 35 + + drivers/gpu/drm/i915/i915_module.c | 8 +- + drivers/gpu/drm/i915/i915_params.c | 3 + + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pci.c | 129 +- + drivers/gpu/drm/i915/i915_perf.c | 2 +- + drivers/gpu/drm/i915/i915_pmu.c | 14 +- + drivers/gpu/drm/i915/i915_query.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 566 ++++-- + drivers/gpu/drm/i915/i915_request.c | 149 +- + drivers/gpu/drm/i915/i915_request.h | 30 +- + drivers/gpu/drm/i915/i915_scatterlist.c | 62 +- + drivers/gpu/drm/i915/i915_scatterlist.h | 76 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 81 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 23 +- + drivers/gpu/drm/i915/i915_sw_fence_work.c | 2 +- + drivers/gpu/drm/i915/i915_switcheroo.c | 5 +- + drivers/gpu/drm/i915/i915_sysfs.c | 41 +- + drivers/gpu/drm/i915/i915_trace.h | 506 +---- + drivers/gpu/drm/i915/i915_vma.c | 523 ++++- + drivers/gpu/drm/i915/i915_vma.h | 14 +- + drivers/gpu/drm/i915/i915_vma_snapshot.c | 134 ++ + drivers/gpu/drm/i915/i915_vma_snapshot.h | 112 ++ + drivers/gpu/drm/i915/i915_vma_types.h | 21 +- + drivers/gpu/drm/i915/intel_device_info.c | 64 +- + drivers/gpu/drm/i915/intel_device_info.h | 25 +- + drivers/gpu/drm/i915/intel_gvt.c | 2 +- + drivers/gpu/drm/i915/intel_memory_region.c | 154 +- + drivers/gpu/drm/i915/intel_memory_region.h | 9 +- + drivers/gpu/drm/i915/intel_pch.c | 1 + + drivers/gpu/drm/i915/intel_pch.h | 1 + + drivers/gpu/drm/i915/intel_pm.c | 119 +- + drivers/gpu/drm/i915/intel_pm_types.h | 76 + + drivers/gpu/drm/i915/intel_region_ttm.c | 50 +- + drivers/gpu/drm/i915/intel_region_ttm.h | 7 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 + + drivers/gpu/drm/i915/intel_step.c | 77 +- + drivers/gpu/drm/i915/intel_step.h | 3 +- + drivers/gpu/drm/i915/intel_uncore.c | 28 +- + drivers/gpu/drm/i915/intel_uncore.h | 5 +- + drivers/gpu/drm/i915/intel_wopcm.c | 2 +- + drivers/gpu/drm/i915/pxp/intel_pxp.c | 5 + + drivers/gpu/drm/i915/pxp/intel_pxp.h | 15 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 3 +- + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 10 +- + drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 2 - + drivers/gpu/drm/i915/selftests/i915_active.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 25 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 18 +- + drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 24 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 17 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 2 +- + drivers/gpu/drm/i915/selftests/igt_live_test.c | 4 +- + drivers/gpu/drm/i915/selftests/igt_reset.c | 2 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 12 +- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 +- + drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 8 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 34 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 12 +- + drivers/gpu/drm/i915/selftests/mock_region.c | 19 +- + drivers/gpu/drm/i915/selftests/mock_uncore.c | 2 +- + drivers/gpu/drm/i915/vlv_sideband.c | 3 +- + drivers/gpu/drm/imx/Kconfig | 2 +- + drivers/gpu/drm/imx/dcss/Kconfig | 2 +- + drivers/gpu/drm/ingenic/Kconfig | 1 - + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 283 ++- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 127 +- + drivers/gpu/drm/kmb/Kconfig | 1 - + drivers/gpu/drm/kmb/kmb_drv.c | 4 + + drivers/gpu/drm/lima/lima_device.c | 1 + + drivers/gpu/drm/lima/lima_gem.c | 20 +- + drivers/gpu/drm/lima/lima_sched.c | 4 +- + drivers/gpu/drm/mcde/Kconfig | 1 - + drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 6 + + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 20 + + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 6 + + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 175 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 217 ++- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 23 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 142 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 3 +- + drivers/gpu/drm/meson/Kconfig | 3 +- + drivers/gpu/drm/meson/Makefile | 3 +- + drivers/gpu/drm/meson/meson_drv.c | 71 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 342 +--- + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 284 +++ + .../{meson_venc_cvbs.h => meson_encoder_cvbs.h} | 2 +- + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 447 +++++ + drivers/gpu/drm/meson/meson_encoder_hdmi.h | 12 + + drivers/gpu/drm/meson/meson_venc_cvbs.c | 293 --- + drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 4 +- + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/Makefile | 8 +- + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 3 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 3 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 3 +- + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 55 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 25 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 15 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 10 - + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 104 +- + drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 10 + + drivers/gpu/drm/msm/adreno/a6xx_hfi.h | 11 + + drivers/gpu/drm/msm/adreno/adreno_device.c | 38 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 4 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 7 + + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 41 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 5 - + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 38 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 17 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 8 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 18 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 3 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 98 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 44 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 150 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 40 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 25 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 564 +++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 22 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c | 56 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot.c | 27 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot.h | 14 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 9 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 23 +- + drivers/gpu/drm/msm/dp/dp_display.c | 59 +- + drivers/gpu/drm/msm/dp/dp_display.h | 1 + + drivers/gpu/drm/msm/dp/dp_drm.c | 75 + + drivers/gpu/drm/msm/dp/dp_hpd.c | 2 - + drivers/gpu/drm/msm/dp/dp_hpd.h | 2 - + drivers/gpu/drm/msm/dp/dp_link.c | 19 +- + drivers/gpu/drm/msm/dsi/dsi.c | 64 +- + drivers/gpu/drm/msm/dsi/dsi.h | 7 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 77 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 37 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 13 +- + drivers/gpu/drm/msm/edp/edp.c | 198 -- + drivers/gpu/drm/msm/edp/edp.h | 77 - + drivers/gpu/drm/msm/edp/edp.xml.h | 388 ---- + drivers/gpu/drm/msm/edp/edp_aux.c | 265 --- + drivers/gpu/drm/msm/edp/edp_bridge.c | 111 -- + drivers/gpu/drm/msm/edp/edp_connector.c | 132 -- + drivers/gpu/drm/msm/edp/edp_ctrl.c | 1373 ------------- + drivers/gpu/drm/msm/edp/edp_phy.c | 98 - + drivers/gpu/drm/msm/hdmi/hdmi.c | 19 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 19 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 83 +- + .../drm/msm/hdmi/{hdmi_connector.c => hdmi_hpd.c} | 158 +- + drivers/gpu/drm/msm/msm_debugfs.c | 127 +- + drivers/gpu/drm/msm/msm_drv.c | 117 +- + drivers/gpu/drm/msm/msm_drv.h | 37 +- + drivers/gpu/drm/msm/msm_fbdev.c | 13 +- + drivers/gpu/drm/msm/msm_fence.h | 12 + + drivers/gpu/drm/msm/msm_gem.c | 29 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- + drivers/gpu/drm/msm/msm_gpu.c | 22 +- + drivers/gpu/drm/msm/msm_gpu.h | 66 +- + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 91 +- + drivers/gpu/drm/msm/msm_kms.h | 11 +- + drivers/gpu/drm/msm/msm_perf.c | 9 +- + drivers/gpu/drm/msm/msm_rd.c | 16 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 4 +- + drivers/gpu/drm/mxsfb/Kconfig | 2 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 4 +- + drivers/gpu/drm/nouveau/dispnv50/Kbuild | 1 + + drivers/gpu/drm/nouveau/dispnv50/base907c.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/corec57d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/crc.c | 64 +- + drivers/gpu/drm/nouveau/dispnv50/crc.h | 7 +- + drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 8 +- + drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 45 +- + drivers/gpu/drm/nouveau/dispnv50/crcc37d.h | 40 + + drivers/gpu/drm/nouveau/dispnv50/crcc57d.c | 58 + + drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 15 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 38 +- + drivers/gpu/drm/nouveau/dispnv50/head.h | 2 + + drivers/gpu/drm/nouveau/dispnv50/head907d.c | 6 + + drivers/gpu/drm/nouveau/dispnv50/head917d.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 3 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 15 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.h | 4 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 7 +- + .../gpu/drm/nouveau/include/nvhw/class/cl907d.h | 3 + + .../gpu/drm/nouveau/include/nvhw/class/clc57d.h | 69 + + drivers/gpu/drm/nouveau/nouveau_backlight.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 50 +- + drivers/gpu/drm/nouveau/nvkm/core/client.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 4 +- + .../gpu/drm/nouveau/nvkm/engine/disp/coregv100.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/falcon/base.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 2 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/mcp89.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 37 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm200.c | 31 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 2 + + drivers/gpu/drm/omapdrm/Makefile | 1 + + drivers/gpu/drm/omapdrm/dss/dispc.c | 44 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 14 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 11 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 5 + + drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c | 14 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_cec.h | 14 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 4 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 5 +- + drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 5 +- + drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 4 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 11 +- + drivers/gpu/drm/omapdrm/dss/video-pll.c | 8 +- + drivers/gpu/drm/omapdrm/omap_dmm_priv.h | 10 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 10 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 10 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 196 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 24 + + drivers/gpu/drm/omapdrm/omap_fb.c | 33 +- + drivers/gpu/drm/omapdrm/omap_fb.h | 4 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 79 +- + drivers/gpu/drm/omapdrm/omap_gem.h | 2 + + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 34 +- + drivers/gpu/drm/omapdrm/omap_overlay.c | 212 +++ + drivers/gpu/drm/omapdrm/omap_overlay.h | 35 + + drivers/gpu/drm/omapdrm/omap_plane.c | 349 +++- + drivers/gpu/drm/omapdrm/omap_plane.h | 1 + + drivers/gpu/drm/omapdrm/tcm-sita.c | 10 +- + drivers/gpu/drm/panel/Kconfig | 43 +- + drivers/gpu/drm/panel/Makefile | 4 + + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 14 +- + drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 445 +++++ + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 108 +- + drivers/gpu/drm/panel/panel-dsi-cm.c | 4 +- + drivers/gpu/drm/panel/panel-edp.c | 4 +- + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 13 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 29 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 265 ++- + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 14 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 10 +- + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 323 ++++ + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 8 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 8 +- + drivers/gpu/drm/panel/panel-lvds.c | 18 +- + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 702 +++++++ + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 10 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 20 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 8 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 8 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 21 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 1 + + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 17 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 21 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 8 +- + drivers/gpu/drm/panel/panel-simple.c | 86 + + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 552 ++++++ + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 14 +- + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 25 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 22 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 6 +- + drivers/gpu/drm/pl111/Kconfig | 1 - + drivers/gpu/drm/qxl/qxl_debugfs.c | 17 +- + drivers/gpu/drm/qxl/qxl_drv.c | 3 +- + drivers/gpu/drm/radeon/radeon_drv.c | 9 +- + drivers/gpu/drm/radeon/radeon_kms.c | 38 +- + drivers/gpu/drm/radeon/radeon_sync.c | 22 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 13 +- + drivers/gpu/drm/radeon/radeon_vce.c | 2 +- + drivers/gpu/drm/rcar-du/Kconfig | 31 +- + drivers/gpu/drm/rcar-du/Makefile | 1 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 31 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 10 +- + drivers/gpu/drm/rcar-du/rcar_mipi_dsi.c | 819 ++++++++ + drivers/gpu/drm/rcar-du/rcar_mipi_dsi_regs.h | 172 ++ + drivers/gpu/drm/rockchip/Makefile | 1 - + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 82 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 23 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 - + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 163 -- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h | 24 - + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 44 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 7 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +- + drivers/gpu/drm/scheduler/sched_entity.c | 15 +- + drivers/gpu/drm/shmobile/Kconfig | 1 - + drivers/gpu/drm/sprd/Kconfig | 13 + + drivers/gpu/drm/sprd/Makefile | 8 + + drivers/gpu/drm/sprd/megacores_pll.c | 305 +++ + drivers/gpu/drm/sprd/sprd_dpu.c | 880 +++++++++ + drivers/gpu/drm/sprd/sprd_dpu.h | 109 ++ + drivers/gpu/drm/sprd/sprd_drm.c | 205 ++ + drivers/gpu/drm/sprd/sprd_drm.h | 19 + + drivers/gpu/drm/sprd/sprd_dsi.c | 1073 +++++++++++ + drivers/gpu/drm/sprd/sprd_dsi.h | 126 ++ + drivers/gpu/drm/sti/Kconfig | 1 - + drivers/gpu/drm/stm/Kconfig | 1 - + drivers/gpu/drm/sun4i/Kconfig | 1 - + drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- + drivers/gpu/drm/tegra/Kconfig | 3 + + drivers/gpu/drm/tegra/Makefile | 3 +- + drivers/gpu/drm/tegra/dc.c | 194 +- + drivers/gpu/drm/tegra/dc.h | 3 + + drivers/gpu/drm/tegra/drm.c | 30 +- + drivers/gpu/drm/tegra/drm.h | 1 + + drivers/gpu/drm/tegra/gem.c | 171 +- + drivers/gpu/drm/tegra/gr2d.c | 151 +- + drivers/gpu/drm/tegra/gr3d.c | 353 +++- + drivers/gpu/drm/tegra/hdmi.c | 183 +- + drivers/gpu/drm/tegra/hub.h | 1 - + drivers/gpu/drm/tegra/nvdec.c | 466 +++++ + drivers/gpu/drm/tegra/plane.c | 65 +- + drivers/gpu/drm/tegra/plane.h | 2 +- + drivers/gpu/drm/tegra/rgb.c | 53 +- + drivers/gpu/drm/tegra/submit.c | 77 +- + drivers/gpu/drm/tegra/uapi.c | 68 +- + drivers/gpu/drm/tegra/uapi.h | 5 +- + drivers/gpu/drm/tegra/vic.c | 61 +- + drivers/gpu/drm/tidss/Kconfig | 1 - + drivers/gpu/drm/tidss/tidss_drv.c | 13 +- + drivers/gpu/drm/tilcdc/Kconfig | 1 - + drivers/gpu/drm/tiny/Kconfig | 31 +- + drivers/gpu/drm/tiny/Makefile | 1 + + drivers/gpu/drm/tiny/bochs.c | 3 +- + drivers/gpu/drm/tiny/cirrus.c | 28 +- + drivers/gpu/drm/tiny/ili9163.c | 225 +++ + drivers/gpu/drm/tiny/repaper.c | 2 +- + drivers/gpu/drm/tiny/simpledrm.c | 41 +- + drivers/gpu/drm/tiny/st7586.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 3 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 11 +- + drivers/gpu/drm/tve200/Kconfig | 1 - + drivers/gpu/drm/v3d/v3d_bo.c | 26 +- + drivers/gpu/drm/v3d/v3d_gem.c | 4 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +- + drivers/gpu/drm/vboxvideo/vbox_main.c | 4 +- + drivers/gpu/drm/vc4/Kconfig | 1 - + drivers/gpu/drm/vc4/vc4_bo.c | 10 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 91 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 7 +- + drivers/gpu/drm/vc4/vc4_drv.h | 37 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 630 ++++-- + drivers/gpu/drm/vc4/vc4_hdmi.h | 37 + + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 37 + + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 8 + + drivers/gpu/drm/vc4/vc4_hvs.c | 26 +- + drivers/gpu/drm/vc4/vc4_kms.c | 130 +- + drivers/gpu/drm/vc4/vc4_plane.c | 203 +- + drivers/gpu/drm/vc4/vc4_regs.h | 19 +- + drivers/gpu/drm/vc4/vc4_txp.c | 4 +- + drivers/gpu/drm/vgem/vgem_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 29 +- + drivers/gpu/drm/vmwgfx/Kconfig | 1 + + drivers/gpu/drm/vmwgfx/Makefile | 6 +- + drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h | 6 +- + .../gpu/drm/vmwgfx/device_include/svga3d_devcaps.h | 10 +- + drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h | 12 +- + .../gpu/drm/vmwgfx/device_include/svga3d_limits.h | 8 +- + drivers/gpu/drm/vmwgfx/device_include/svga3d_reg.h | 6 +- + .../gpu/drm/vmwgfx/device_include/svga3d_types.h | 7 +- + .../gpu/drm/vmwgfx/device_include/svga_escape.h | 6 +- + .../gpu/drm/vmwgfx/device_include/svga_overlay.h | 6 +- + drivers/gpu/drm/vmwgfx/device_include/svga_reg.h | 14 +- + drivers/gpu/drm/vmwgfx/ttm_memory.c | 683 ------- + drivers/gpu/drm/vmwgfx/ttm_memory.h | 96 - + drivers/gpu/drm/vmwgfx/ttm_object.c | 180 +- + drivers/gpu/drm/vmwgfx/ttm_object.h | 59 +- + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 45 +- + drivers/gpu/drm/vmwgfx/vmwgfx_binding.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 584 ++---- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 7 + + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 43 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 30 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 26 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 92 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 154 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 84 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 43 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 294 +++ + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_hashtab.c | 199 ++ + .../gpu/drm/vmwgfx/vmwgfx_hashtab.h | 54 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 3 + + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 45 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 25 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 91 +- + drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c | 29 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 21 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.h | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c | 21 - + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 158 +- + drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c | 90 + + drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 184 -- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 135 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 74 +- + drivers/gpu/drm/vmwgfx/vmwgfx_va.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 35 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 53 +- + drivers/gpu/drm/xen/xen_drm_front.c | 16 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 108 +- + drivers/gpu/drm/xen/xen_drm_front_gem.h | 7 - + drivers/gpu/drm/xlnx/Kconfig | 1 - + drivers/gpu/host1x/Kconfig | 1 + + drivers/gpu/host1x/bus.c | 80 +- + drivers/gpu/host1x/channel.c | 8 + + drivers/gpu/host1x/debug.c | 15 + + drivers/gpu/host1x/dev.c | 185 +- + drivers/gpu/host1x/dev.h | 5 +- + drivers/gpu/host1x/hw/channel_hw.c | 44 +- + drivers/gpu/host1x/intr.c | 3 - + drivers/gpu/host1x/job.c | 160 +- + drivers/gpu/host1x/job.h | 6 +- + drivers/gpu/host1x/syncpt.c | 5 +- + drivers/of/platform.c | 4 + + drivers/platform/x86/Kconfig | 2 + + drivers/platform/x86/thinkpad_acpi.c | 137 +- + drivers/pwm/core.c | 26 + + drivers/pwm/pwm-pxa.c | 16 +- + drivers/video/console/vgacon.c | 21 - + drivers/video/fbdev/core/fbsysfs.c | 14 +- + drivers/video/fbdev/omap/omapfb_main.c | 1 + + .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 14 +- + .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 18 +- + .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 20 +- + drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c | 12 +- + drivers/video/fbdev/simplefb.c | 21 +- + include/drm/drm_connector.h | 55 + + include/drm/drm_device.h | 5 +- + include/drm/drm_dp_helper.h | 35 +- + include/drm/drm_drv.h | 17 +- + include/drm/drm_format_helper.h | 61 +- + include/drm/drm_gem_atomic_helper.h | 18 + + include/drm/drm_gem_cma_helper.h | 189 +- + include/drm/drm_gem_shmem_helper.h | 168 +- + include/drm/drm_gem_ttm_helper.h | 2 +- + include/drm/drm_gem_vram_helper.h | 2 +- + include/drm/drm_legacy.h | 15 +- + include/drm/drm_mm.h | 4 +- + include/drm/drm_mode_config.h | 13 + + include/drm/drm_of.h | 7 + + include/drm/drm_privacy_screen_consumer.h | 65 + + include/drm/drm_privacy_screen_driver.h | 84 + + include/drm/drm_privacy_screen_machine.h | 46 + + include/drm/drm_probe_helper.h | 1 + + include/drm/drm_sysfs.h | 1 + + include/drm/gpu_scheduler.h | 12 +- + include/drm/i915_pciids.h | 9 + + include/drm/intel-gtt.h | 8 +- + include/drm/ttm/ttm_bo_api.h | 1 - + include/drm/ttm/ttm_placement.h | 11 + + include/linux/console.h | 6 - + include/linux/dma-buf.h | 4 +- + include/linux/dma-fence.h | 1 + + include/linux/dma-resv.h | 27 +- + include/linux/host1x.h | 76 +- + include/linux/pwm.h | 2 + + include/uapi/drm/amdgpu_drm.h | 2 +- + include/uapi/drm/drm.h | 18 + + include/uapi/drm/drm_fourcc.h | 11 + + include/uapi/drm/vmwgfx_drm.h | 1 + + include/uapi/linux/kfd_sysfs.h | 108 ++ + 1126 files changed, 47221 insertions(+), 24873 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ptn3460.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,dsi-csi2-tx.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/sii9234.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/sil,sii9234.yaml + delete mode 100644 Documentation/devicetree/bindings/display/msm/edp.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,bf060y8m-aj0.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9163.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt35950.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sony,tulip-truly-nt35521.yaml + create mode 100644 Documentation/devicetree/bindings/display/sprd/sprd,display-subsystem.yaml + create mode 100644 Documentation/devicetree/bindings/display/sprd/sprd,sharkl3-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/sprd/sprd,sharkl3-dsi-host.yaml + delete mode 100644 Documentation/gpu/amdgpu-dc.rst + delete mode 100644 Documentation/gpu/amdgpu.rst + create mode 100644 Documentation/gpu/amdgpu/amdgpu-glossary.rst + create mode 100644 Documentation/gpu/amdgpu/display/config_example.svg + create mode 100644 Documentation/gpu/amdgpu/display/dc-debug.rst + create mode 100644 Documentation/gpu/amdgpu/display/dc-glossary.rst + create mode 100644 Documentation/gpu/amdgpu/display/dc_pipeline_overview.svg + create mode 100644 Documentation/gpu/amdgpu/display/dcn-overview.rst + create mode 100644 Documentation/gpu/amdgpu/display/display-manager.rst + create mode 100644 Documentation/gpu/amdgpu/display/global_sync_vblank.svg + create mode 100644 Documentation/gpu/amdgpu/display/index.rst + create mode 100644 Documentation/gpu/amdgpu/driver-core.rst + create mode 100644 Documentation/gpu/amdgpu/driver-misc.rst + create mode 100644 Documentation/gpu/amdgpu/index.rst + create mode 100644 Documentation/gpu/amdgpu/module-parameters.rst + create mode 100644 Documentation/gpu/amdgpu/ras.rst + create mode 100644 Documentation/gpu/amdgpu/thermal.rst + create mode 100644 Documentation/gpu/amdgpu/xgmi.rst + create mode 100644 drivers/dma-buf/st-dma-resv.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_wrapper_translation.c + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/dml_wrapper.h + create mode 100644 drivers/gpu/drm/ast/ast_i2c.c + create mode 100644 drivers/gpu/drm/drm_nomodeset.c + create mode 100644 drivers/gpu/drm/drm_privacy_screen.c + create mode 100644 drivers/gpu/drm/drm_privacy_screen_x86.c + create mode 100644 drivers/gpu/drm/i915/display/icl_dsi.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_trace.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_trace.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dsi_vbt.h + create mode 100644 drivers/gpu/drm/i915/display/intel_pch_display.c + create mode 100644 drivers/gpu/drm/i915/display/intel_pch_display.h + create mode 100644 drivers/gpu/drm/i915/display/intel_pch_refclk.c + create mode 100644 drivers/gpu/drm/i915/display/intel_pch_refclk.h + create mode 100644 drivers/gpu/drm/i915/display/vlv_dsi.h + create mode 100644 drivers/gpu/drm/i915/display/vlv_dsi_pll.h + delete mode 100644 drivers/gpu/drm/i915/dma_resv_utils.c + delete mode 100644 drivers/gpu/drm/i915/dma_resv_utils.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm_move.h + create mode 100644 drivers/gpu/drm/i915/i915_deps.c + create mode 100644 drivers/gpu/drm/i915/i915_deps.h + rename drivers/gpu/drm/i915/{i915_drv.c => i915_driver.c} (95%) + create mode 100644 drivers/gpu/drm/i915/i915_driver.h + create mode 100644 drivers/gpu/drm/i915/i915_iosf_mbi.h + create mode 100644 drivers/gpu/drm/i915/i915_mm.h + create mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.c + create mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.h + create mode 100644 drivers/gpu/drm/i915/intel_pm_types.h + create mode 100644 drivers/gpu/drm/meson/meson_encoder_cvbs.c + rename drivers/gpu/drm/meson/{meson_venc_cvbs.h => meson_encoder_cvbs.h} (92%) + create mode 100644 drivers/gpu/drm/meson/meson_encoder_hdmi.c + create mode 100644 drivers/gpu/drm/meson/meson_encoder_hdmi.h + delete mode 100644 drivers/gpu/drm/meson/meson_venc_cvbs.c + delete mode 100644 drivers/gpu/drm/msm/edp/edp.c + delete mode 100644 drivers/gpu/drm/msm/edp/edp.h + delete mode 100644 drivers/gpu/drm/msm/edp/edp.xml.h + delete mode 100644 drivers/gpu/drm/msm/edp/edp_aux.c + delete mode 100644 drivers/gpu/drm/msm/edp/edp_bridge.c + delete mode 100644 drivers/gpu/drm/msm/edp/edp_connector.c + delete mode 100644 drivers/gpu/drm/msm/edp/edp_ctrl.c + delete mode 100644 drivers/gpu/drm/msm/edp/edp_phy.c + rename drivers/gpu/drm/msm/hdmi/{hdmi_connector.c => hdmi_hpd.c} (62%) + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crcc37d.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crcc57d.c + create mode 100644 drivers/gpu/drm/omapdrm/omap_overlay.c + create mode 100644 drivers/gpu/drm/omapdrm/omap_overlay.h + create mode 100644 drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c + create mode 100644 drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt35950.c + create mode 100644 drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_mipi_dsi.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_mipi_dsi_regs.h + delete mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c + delete mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h + create mode 100644 drivers/gpu/drm/sprd/Kconfig + create mode 100644 drivers/gpu/drm/sprd/Makefile + create mode 100644 drivers/gpu/drm/sprd/megacores_pll.c + create mode 100644 drivers/gpu/drm/sprd/sprd_dpu.c + create mode 100644 drivers/gpu/drm/sprd/sprd_dpu.h + create mode 100644 drivers/gpu/drm/sprd/sprd_drm.c + create mode 100644 drivers/gpu/drm/sprd/sprd_drm.h + create mode 100644 drivers/gpu/drm/sprd/sprd_dsi.c + create mode 100644 drivers/gpu/drm/sprd/sprd_dsi.h + create mode 100644 drivers/gpu/drm/tegra/nvdec.c + create mode 100644 drivers/gpu/drm/tiny/ili9163.c + delete mode 100644 drivers/gpu/drm/vmwgfx/ttm_memory.c + delete mode 100644 drivers/gpu/drm/vmwgfx/ttm_memory.h + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_gem.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_hashtab.c + rename include/drm/drm_hashtab.h => drivers/gpu/drm/vmwgfx/vmwgfx_hashtab.h (58%) + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c + delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c + create mode 100644 include/drm/drm_privacy_screen_consumer.h + create mode 100644 include/drm/drm_privacy_screen_driver.h + create mode 100644 include/drm/drm_privacy_screen_machine.h + create mode 100644 include/uapi/linux/kfd_sysfs.h +Merging drm-misc/for-linux-next (5da8b49de472 dt-bindings: display: bridge: lvds-codec: Fix duplicate key) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (c4f21bcaf4ac drm/amdgpu: bump driver version for new CTX OP to set/get stable pstates) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/Kconfig +Merge made by the 'recursive' strategy. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 147 ++++++++++++++++++++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 7 ++ + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 3 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 +++++++++++++++ + include/uapi/drm/amdgpu_drm.h | 17 ++- + 17 files changed, 291 insertions(+), 12 deletions(-) +Merging drm-intel/for-linux-next (c65fe9cbbfd6 drm/i915/fbc: Remember to update FBC state even when not reallocating CFB) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Already up to date. +Merging drm-intel-gt/for-linux-next-gt (c65fe9cbbfd6 drm/i915/fbc: Remember to update FBC state even when not reallocating CFB) +$ git merge -m Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel drm-intel-gt/for-linux-next-gt +Already up to date. +Merging drm-tegra/drm/tegra/for-next (d210919dbdc8 drm/tegra: Add back arm_iommu_detach_device()) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-msm/msm-next (6ed95285382d drm/msm/a5xx: Fix missing CP_PROTECT for SMMU on A540) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-tve.c | 4 +--- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 2 files changed, 4 insertions(+), 9 deletions(-) +Merging etnaviv/etnaviv/next (cdd156955f94 drm/etnaviv: consider completed fence seqno in hang check) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (02d6fdecb9c3 regmap: allow to define reg_update_bits for no bus configuration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merging sound/for-next (57f234248ff9 ALSA: hda/cs8409: Fix Jack detection after resume) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/usb/mixer_quirks.c +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/pci/hda/patch_hdmi.c +Auto-merging sound/pci/hda/patch_cs8409.c +Auto-merging sound/pci/hda/hda_local.h +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging sound/hda/intel-dsp-config.c +Removing sound/core/sgbuf.c +Auto-merging sound/core/oss/pcm_oss.c +Auto-merging sound/core/jack.c +Auto-merging arch/arm64/boot/dts/nvidia/tegra194.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/sound/nvidia,tegra30-hda.yaml | 2 + + MAINTAINERS | 8 + + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 5 +- + include/sound/hda_codec.h | 8 +- + include/sound/hdaudio.h | 1 + + include/sound/hdaudio_ext.h | 27 +- + include/sound/intel-nhlt.h | 37 +- + include/sound/memalloc.h | 14 +- + include/sound/pcm.h | 3 + + include/uapi/sound/asound.h | 5 + + sound/core/Makefile | 1 - + sound/core/control_led.c | 2 +- + sound/core/info_oss.c | 6 +- + sound/core/jack.c | 3 + + sound/core/memalloc.c | 53 +- + sound/core/oss/pcm_oss.c | 2 +- + sound/core/pcm.c | 6 +- + sound/core/seq/seq_queue.c | 14 +- + sound/core/sgbuf.c | 201 ------ + sound/hda/ext/hdac_ext_stream.c | 216 +++---- + sound/hda/hdac_stream.c | 30 +- + sound/hda/intel-dsp-config.c | 10 +- + sound/hda/intel-nhlt.c | 102 +++ + sound/isa/gus/gus_mem.c | 22 +- + sound/pci/ac97/ac97_pcm.c | 2 +- + sound/pci/hda/hda_auto_parser.c | 6 +- + sound/pci/hda/hda_bind.c | 7 + + sound/pci/hda/hda_codec.c | 45 +- + sound/pci/hda/hda_controller.c | 1 - + sound/pci/hda/hda_generic.h | 2 +- + sound/pci/hda/hda_intel.c | 11 +- + sound/pci/hda/hda_jack.c | 11 + + sound/pci/hda/hda_jack.h | 1 + + sound/pci/hda/hda_local.h | 1 + + sound/pci/hda/hda_tegra.c | 43 +- + sound/pci/hda/patch_cs8409-tables.c | 3 + + sound/pci/hda/patch_cs8409.c | 9 +- + sound/pci/hda/patch_cs8409.h | 1 + + sound/pci/hda/patch_hdmi.c | 2 +- + sound/pci/hda/patch_realtek.c | 30 +- + sound/pci/mixart/mixart_core.c | 5 +- + sound/pci/mixart/mixart_core.h | 10 +- + sound/ppc/beep.c | 2 +- + sound/soc/codecs/sta350.h | 2 +- + sound/soc/codecs/tlv320aic26.h | 6 +- + sound/soc/intel/skylake/skl-nhlt.c | 102 --- + sound/soc/intel/skylake/skl-pcm.c | 4 +- + sound/soc/intel/skylake/skl-topology.c | 29 +- + sound/soc/intel/skylake/skl-topology.h | 1 + + sound/soc/intel/skylake/skl.c | 4 +- + sound/soc/intel/skylake/skl.h | 4 - + sound/sparc/dbri.c | 6 +- + sound/usb/card.c | 7 - + sound/usb/format.c | 2 +- + sound/usb/mixer.c | 5 +- + sound/usb/mixer.h | 2 - + sound/usb/mixer_maps.c | 17 +- + sound/usb/mixer_quirks.c | 4 +- + sound/usb/mixer_quirks.h | 2 - + sound/usb/power.h | 10 - + sound/usb/quirks.c | 2 +- + sound/usb/usx2y/usbusx2y.c | 2 +- + tools/testing/selftests/Makefile | 3 +- + tools/testing/selftests/alsa/.gitignore | 1 + + tools/testing/selftests/alsa/Makefile | 9 + + tools/testing/selftests/alsa/mixer-test.c | 705 +++++++++++++++++++++ + 66 files changed, 1308 insertions(+), 591 deletions(-) + delete mode 100644 sound/core/sgbuf.c + create mode 100644 tools/testing/selftests/alsa/.gitignore + create mode 100644 tools/testing/selftests/alsa/Makefile + create mode 100644 tools/testing/selftests/alsa/mixer-test.c +Merging sound-asoc/for-next (9f3d45318dd9 ASoC: fsl_mqs: fix MODULE_ALIAS) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Removing sound/soc/sof/imx/imx-ops.h +Auto-merging sound/soc/intel/skylake/skl-pcm.c +Auto-merging include/uapi/sound/asound.h +Auto-merging drivers/tty/serial/msm_serial.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/wm8903.txt +Removing Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt +Removing Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt +Removing Documentation/devicetree/bindings/sound/cs42l42.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/ak4375.yaml | 57 + + .../devicetree/bindings/sound/amlogic,aiu.yaml | 5 + + .../bindings/sound/amlogic,g12a-toacodec.yaml | 5 + + .../devicetree/bindings/sound/amlogic,t9015.yaml | 5 + + .../bindings/sound/audio-graph-port.yaml | 9 +- + .../devicetree/bindings/sound/cirrus,cs42l42.yaml | 225 ++++ + .../devicetree/bindings/sound/cs42l42.txt | 115 -- + .../devicetree/bindings/sound/linux,spdif-dit.yaml | 5 + + .../devicetree/bindings/sound/mt8195-afe-pcm.yaml | 8 + + .../sound/mt8195-mt6359-rt1011-rt5682.yaml | 4 + + .../sound/mt8195-mt6359-rt1019-rt5682.yaml | 14 + + .../bindings/sound/nvidia,tegra-audio-alc5632.txt | 48 - + .../bindings/sound/nvidia,tegra-audio-alc5632.yaml | 74 ++ + .../bindings/sound/nvidia,tegra-audio-common.yaml | 83 ++ + .../sound/nvidia,tegra-audio-graph-card.yaml | 10 + + .../bindings/sound/nvidia,tegra-audio-max98090.txt | 53 - + .../sound/nvidia,tegra-audio-max98090.yaml | 97 ++ + .../bindings/sound/nvidia,tegra-audio-rt5640.txt | 52 - + .../bindings/sound/nvidia,tegra-audio-rt5640.yaml | 85 ++ + .../bindings/sound/nvidia,tegra-audio-rt5677.txt | 67 - + .../bindings/sound/nvidia,tegra-audio-rt5677.yaml | 100 ++ + .../bindings/sound/nvidia,tegra-audio-sgtl5000.txt | 42 - + .../sound/nvidia,tegra-audio-sgtl5000.yaml | 67 + + .../sound/nvidia,tegra-audio-trimslice.txt | 21 - + .../sound/nvidia,tegra-audio-trimslice.yaml | 33 + + .../bindings/sound/nvidia,tegra-audio-wm8753.txt | 40 - + .../bindings/sound/nvidia,tegra-audio-wm8753.yaml | 79 ++ + .../bindings/sound/nvidia,tegra-audio-wm8903.txt | 62 - + .../bindings/sound/nvidia,tegra-audio-wm8903.yaml | 93 ++ + .../bindings/sound/nvidia,tegra-audio-wm9712.txt | 60 - + .../bindings/sound/nvidia,tegra-audio-wm9712.yaml | 76 ++ + .../bindings/sound/nvidia,tegra20-i2s.txt | 30 - + .../bindings/sound/nvidia,tegra20-i2s.yaml | 77 ++ + .../bindings/sound/nvidia,tegra20-spdif.yaml | 85 ++ + .../devicetree/bindings/sound/nxp,tfa989x.yaml | 41 + + .../devicetree/bindings/sound/qcom,apq8016-sbc.txt | 96 -- + .../devicetree/bindings/sound/qcom,sm8250.yaml | 152 ++- + .../devicetree/bindings/sound/realtek,rt5682s.yaml | 4 + + .../bindings/sound/simple-audio-amplifier.yaml | 8 +- + .../bindings/sound/ti,tlv320adc3xxx.yaml | 137 ++ + .../devicetree/bindings/sound/wlf,wm8903.yaml | 116 ++ + Documentation/devicetree/bindings/sound/wm8903.txt | 82 -- + MAINTAINERS | 1 + + drivers/dma/mmp_pdma.c | 6 - + drivers/dma/pxa_dma.c | 7 - + drivers/dma/qcom/qcom_adm.c | 56 +- + drivers/dma/sh/shdma-base.c | 8 - + drivers/dma/sprd-dma.c | 3 - + drivers/dma/tegra20-apb-dma.c | 6 - + drivers/dma/xilinx/xilinx_dpdma.c | 17 +- + drivers/firmware/cirrus/cs_dsp.c | 142 ++- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 9 +- + drivers/mmc/host/bcm2835.c | 2 - + drivers/mtd/nand/raw/qcom_nandc.c | 14 +- + drivers/soc/mediatek/mtk-scpsys.c | 15 +- + drivers/soundwire/cadence_master.c | 36 +- + drivers/soundwire/cadence_master.h | 14 +- + drivers/soundwire/intel.c | 253 ++-- + drivers/soundwire/qcom.c | 8 +- + drivers/soundwire/stream.c | 4 +- + drivers/spi/spi-pic32.c | 2 - + drivers/tty/serial/msm_serial.c | 15 +- + include/dt-bindings/sound/rt5640.h | 1 + + include/dt-bindings/sound/tlv320adc3xxx.h | 28 + + include/linux/dma/qcom_adm.h | 12 + + include/linux/dma/xilinx_dpdma.h | 11 + + include/linux/dmaengine.h | 4 - + include/linux/firmware/cirrus/cs_dsp.h | 21 +- + include/linux/firmware/cirrus/wmfw.h | 1 + + include/linux/soundwire/sdw_intel.h | 4 +- + include/sound/cs35l41.h | 739 +++++++++++ + include/sound/dmaengine_pcm.h | 2 - + include/sound/rt5682s.h | 1 + + include/sound/soc-component.h | 4 + + include/sound/soc-dai.h | 36 +- + include/sound/soc-dpcm.h | 2 + + include/sound/soc.h | 3 +- + include/sound/sof.h | 22 + + include/sound/sof/dai-amd.h | 21 + + include/sound/sof/dai-mediatek.h | 23 + + include/sound/sof/dai.h | 35 +- + include/sound/sof/debug.h | 2 + + include/sound/sof/header.h | 1 + + include/uapi/sound/asound.h | 2 +- + include/uapi/sound/sof/tokens.h | 5 + + sound/core/pcm_dmaengine.c | 5 +- + sound/core/pcm_lib.c | 17 + + sound/soc/amd/Kconfig | 9 +- + sound/soc/amd/Makefile | 2 + + sound/soc/amd/acp-config.c | 124 ++ + sound/soc/amd/acp-da7219-max98357a.c | 20 +- + sound/soc/amd/acp-pcm-dma.c | 15 +- + sound/soc/amd/acp-rt5645.c | 4 +- + sound/soc/amd/acp.h | 1 + + sound/soc/amd/acp/Kconfig | 8 +- + sound/soc/amd/acp/acp-legacy-mach.c | 19 +- + sound/soc/amd/acp/acp-mach-common.c | 25 + + sound/soc/amd/acp/acp-mach.h | 10 +- + sound/soc/amd/acp/acp-sof-mach.c | 21 +- + sound/soc/amd/acp3x-rt5682-max9836.c | 8 +- + sound/soc/amd/mach-config.h | 28 + + sound/soc/amd/yc/acp6x-pdm-dma.c | 2 +- + sound/soc/atmel/mikroe-proto.c | 6 +- + sound/soc/atmel/tse850-pcm5142.c | 32 +- + sound/soc/bcm/bcm63xx-i2s.h | 1 - + sound/soc/bcm/bcm63xx-pcm-whistler.c | 13 +- + sound/soc/codecs/Kconfig | 36 +- + sound/soc/codecs/Makefile | 12 +- + sound/soc/codecs/adau1701.c | 94 +- + sound/soc/codecs/ak4118.c | 18 +- + sound/soc/codecs/ak4375.c | 612 +++++++++ + sound/soc/codecs/cs35l35.c | 2 +- + sound/soc/codecs/cs35l41-i2c.c | 16 - + .../soc/codecs/{cs35l41-tables.c => cs35l41-lib.c} | 492 +++++++- + sound/soc/codecs/cs35l41-spi.c | 17 - + sound/soc/codecs/cs35l41.c | 666 +++++----- + sound/soc/codecs/cs35l41.h | 747 +---------- + sound/soc/codecs/cs4265.c | 4 +- + sound/soc/codecs/cs42l42.c | 94 +- + sound/soc/codecs/cs42l42.h | 6 +- + sound/soc/codecs/es7241.c | 28 +- + sound/soc/codecs/hdac_hda.c | 22 +- + sound/soc/codecs/jz4770.c | 9 + + sound/soc/codecs/max9759.c | 28 +- + sound/soc/codecs/max98373-sdw.c | 2 +- + sound/soc/codecs/max9860.c | 12 +- + sound/soc/codecs/msm8916-wcd-analog.c | 7 +- + sound/soc/codecs/mt6660.c | 5 +- + sound/soc/codecs/pcm3168a.c | 22 +- + sound/soc/codecs/rt1308-sdw.c | 2 +- + sound/soc/codecs/rt1316-sdw.c | 2 +- + sound/soc/codecs/rt5640.c | 106 +- + sound/soc/codecs/rt5663.c | 12 +- + sound/soc/codecs/rt5682-sdw.c | 2 +- + sound/soc/codecs/rt5682.c | 7 +- + sound/soc/codecs/rt5682s.c | 34 +- + sound/soc/codecs/rt700.c | 2 +- + sound/soc/codecs/rt711-sdca.c | 2 +- + sound/soc/codecs/rt711.c | 2 +- + sound/soc/codecs/rt715-sdca.c | 2 +- + sound/soc/codecs/rt715.c | 2 +- + sound/soc/codecs/sdw-mockup.c | 2 +- + sound/soc/codecs/sgtl5000.c | 5 +- + sound/soc/codecs/simple-amplifier.c | 10 +- + sound/soc/codecs/simple-mux.c | 10 +- + sound/soc/codecs/ssm2305.c | 11 +- + sound/soc/codecs/tfa989x.c | 20 +- + sound/soc/codecs/tlv320adc3xxx.c | 1317 ++++++++++++++++++++ + sound/soc/codecs/tlv320aic31xx.c | 121 +- + sound/soc/codecs/tlv320aic31xx.h | 2 +- + sound/soc/codecs/wcd-mbhc-v2.c | 76 +- + sound/soc/codecs/wcd934x.c | 6 +- + sound/soc/codecs/wcd938x.c | 8 +- + sound/soc/codecs/wm_adsp.c | 47 +- + sound/soc/codecs/wsa881x.c | 2 +- + sound/soc/codecs/zl38060.c | 4 +- + sound/soc/fsl/Kconfig | 1 + + sound/soc/fsl/fsl-asoc-card.c | 15 +- + sound/soc/fsl/fsl_mqs.c | 2 +- + sound/soc/fsl/imx-card.c | 17 +- + sound/soc/fsl/imx-hdmi.c | 2 + + sound/soc/fsl/imx-sgtl5000.c | 4 +- + sound/soc/fsl/imx-spdif.c | 4 +- + sound/soc/generic/audio-graph-card.c | 5 +- + sound/soc/generic/audio-graph-card2.c | 4 +- + sound/soc/generic/simple-card-utils.c | 45 +- + sound/soc/generic/simple-card.c | 3 +- + sound/soc/generic/test-component.c | 5 +- + sound/soc/img/img-i2s-in.c | 8 +- + sound/soc/img/img-i2s-out.c | 24 +- + sound/soc/img/img-parallel-out.c | 24 +- + sound/soc/img/img-spdif-in.c | 8 +- + sound/soc/img/img-spdif-out.c | 24 +- + sound/soc/img/pistachio-internal-dac.c | 9 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 14 +- + sound/soc/intel/boards/Kconfig | 20 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- + sound/soc/intel/boards/bytcht_nocodec.c | 2 +- + sound/soc/intel/boards/hda_dsp_common.c | 2 +- + sound/soc/intel/boards/sof_maxim_common.c | 180 +++ + sound/soc/intel/boards/sof_maxim_common.h | 16 + + sound/soc/intel/boards/sof_nau8825.c | 651 ++++++++++ + sound/soc/intel/boards/sof_realtek_common.c | 119 +- + sound/soc/intel/boards/sof_realtek_common.h | 7 + + sound/soc/intel/boards/sof_rt5682.c | 179 ++- + sound/soc/intel/boards/sof_sdw.c | 158 +-- + sound/soc/intel/boards/sof_sdw_common.h | 7 +- + sound/soc/intel/boards/sof_sdw_rt715.c | 7 - + sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 7 - + sound/soc/intel/catpt/dsp.c | 14 +- + sound/soc/intel/catpt/pcm.c | 37 +- + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 48 + + sound/soc/intel/skylake/skl-pcm.c | 7 +- + sound/soc/mediatek/Kconfig | 2 + + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 2 - + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 2 - + sound/soc/mediatek/mt8173/mt8173-max98090.c | 8 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 7 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 7 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 7 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 2 - + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 21 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 26 +- + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 2 - + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 17 +- + sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 12 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 7 + + sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 73 +- + .../mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c | 147 ++- + .../mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c | 470 +++++-- + sound/soc/mediatek/mt8195/mt8195-reg.h | 1 + + sound/soc/meson/aiu.c | 36 +- + sound/soc/meson/axg-fifo.c | 16 +- + sound/soc/meson/axg-pdm.c | 25 +- + sound/soc/meson/axg-spdifin.c | 17 +- + sound/soc/meson/axg-spdifout.c | 17 +- + sound/soc/meson/axg-tdm-formatter.c | 50 +- + sound/soc/meson/axg-tdm-interface.c | 25 +- + sound/soc/meson/meson-card-utils.c | 8 +- + sound/soc/meson/t9015.c | 14 +- + sound/soc/mxs/mxs-sgtl5000.c | 8 +- + sound/soc/qcom/Kconfig | 1 + + sound/soc/qcom/apq8016_sbc.c | 134 +- + sound/soc/qcom/common.c | 20 +- + sound/soc/qcom/qdsp6/q6apm.c | 14 +- + sound/soc/qcom/sc7180.c | 24 +- + sound/soc/qcom/sdm845.c | 14 +- + sound/soc/qcom/sm8250.c | 4 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 10 +- + sound/soc/samsung/aries_wm8994.c | 17 +- + sound/soc/samsung/arndale.c | 5 +- + sound/soc/samsung/idma.c | 2 + + sound/soc/samsung/littlemill.c | 5 +- + sound/soc/samsung/lowland.c | 5 +- + sound/soc/samsung/odroid.c | 4 +- + sound/soc/samsung/smdk_wm8994.c | 4 +- + sound/soc/samsung/smdk_wm8994pcm.c | 4 +- + sound/soc/samsung/snow.c | 9 +- + sound/soc/samsung/speyside.c | 5 +- + sound/soc/samsung/tm2_wm5110.c | 3 +- + sound/soc/samsung/tobermory.c | 5 +- + sound/soc/sh/rz-ssi.c | 7 +- + sound/soc/soc-component.c | 28 + + sound/soc/soc-core.c | 51 +- + sound/soc/soc-dai.c | 40 +- + sound/soc/soc-pcm.c | 380 ++++-- + sound/soc/sof/Kconfig | 18 +- + sound/soc/sof/Makefile | 4 +- + sound/soc/sof/amd/Kconfig | 33 + + sound/soc/sof/amd/Makefile | 11 + + sound/soc/sof/amd/acp-dsp-offset.h | 78 ++ + sound/soc/sof/amd/acp-ipc.c | 187 +++ + sound/soc/sof/amd/acp-loader.c | 199 +++ + sound/soc/sof/amd/acp-pcm.c | 82 ++ + sound/soc/sof/amd/acp-stream.c | 181 +++ + sound/soc/sof/amd/acp-trace.c | 84 ++ + sound/soc/sof/amd/acp.c | 446 +++++++ + sound/soc/sof/amd/acp.h | 226 ++++ + sound/soc/sof/amd/pci-rn.c | 165 +++ + sound/soc/sof/amd/renoir.c | 186 +++ + sound/soc/sof/control.c | 61 +- + sound/soc/sof/core.c | 135 +- + sound/soc/sof/debug.c | 142 ++- + sound/soc/sof/imx/Kconfig | 46 +- + sound/soc/sof/imx/imx-common.c | 28 +- + sound/soc/sof/imx/imx-common.h | 11 + + sound/soc/sof/imx/imx-ops.h | 10 - + sound/soc/sof/imx/imx8.c | 220 +++- + sound/soc/sof/imx/imx8m.c | 260 +++- + sound/soc/sof/intel/apl.c | 7 +- + sound/soc/sof/intel/atom.c | 64 +- + sound/soc/sof/intel/atom.h | 4 +- + sound/soc/sof/intel/bdw.c | 71 +- + sound/soc/sof/intel/byt.c | 9 + + sound/soc/sof/intel/cnl.c | 34 +- + sound/soc/sof/intel/hda-codec.c | 3 +- + sound/soc/sof/intel/hda-ctrl.c | 2 +- + sound/soc/sof/intel/hda-dai.c | 97 +- + sound/soc/sof/intel/hda-dsp.c | 52 +- + sound/soc/sof/intel/hda-ipc.c | 48 +- + sound/soc/sof/intel/hda-loader.c | 104 +- + sound/soc/sof/intel/hda-pcm.c | 127 +- + sound/soc/sof/intel/hda-stream.c | 109 +- + sound/soc/sof/intel/hda.c | 139 +-- + sound/soc/sof/intel/hda.h | 22 +- + sound/soc/sof/intel/icl.c | 73 +- + sound/soc/sof/intel/pci-tng.c | 9 + + sound/soc/sof/intel/shim.h | 11 + + sound/soc/sof/intel/tgl.c | 47 +- + sound/soc/sof/ipc.c | 134 +- + sound/soc/sof/loader.c | 16 +- + sound/soc/sof/mediatek/Kconfig | 33 + + sound/soc/sof/mediatek/Makefile | 2 + + sound/soc/sof/mediatek/adsp_helper.h | 49 + + sound/soc/sof/mediatek/mt8195/Makefile | 3 + + sound/soc/sof/mediatek/mt8195/mt8195-clk.c | 158 +++ + sound/soc/sof/mediatek/mt8195/mt8195-clk.h | 28 + + sound/soc/sof/mediatek/mt8195/mt8195-loader.c | 56 + + sound/soc/sof/mediatek/mt8195/mt8195.c | 463 +++++++ + sound/soc/sof/mediatek/mt8195/mt8195.h | 158 +++ + sound/soc/sof/ops.c | 47 +- + sound/soc/sof/ops.h | 93 +- + sound/soc/sof/pcm.c | 118 +- + sound/soc/sof/pm.c | 10 + + sound/soc/sof/sof-audio.c | 239 +++- + sound/soc/sof/sof-audio.h | 17 +- + sound/soc/sof/sof-of-dev.c | 68 +- + sound/soc/sof/sof-of-dev.h | 17 + + sound/soc/sof/sof-pci-dev.c | 19 +- + sound/soc/sof/sof-priv.h | 82 +- + sound/soc/sof/sof-probes.c | 2 +- + sound/soc/sof/sof-probes.h | 2 +- + sound/soc/sof/topology.c | 292 +++-- + sound/soc/sof/trace.c | 18 + + sound/soc/sof/xtensa/core.c | 44 +- + sound/soc/stm/stm32_adfsdm.c | 5 +- + sound/soc/stm/stm32_i2s.c | 66 +- + sound/soc/stm/stm32_sai.c | 37 +- + sound/soc/stm/stm32_sai_sub.c | 29 +- + sound/soc/stm/stm32_spdifrx.c | 48 +- + sound/soc/sunxi/sun4i-codec.c | 3 +- + sound/soc/sunxi/sun4i-spdif.c | 115 ++ + sound/soc/sunxi/sun8i-codec.c | 56 + + sound/soc/tegra/tegra20_i2s.c | 49 + + sound/soc/tegra/tegra20_spdif.c | 197 ++- + sound/soc/tegra/tegra20_spdif.h | 1 + + sound/soc/tegra/tegra210_mvc.c | 209 +++- + sound/soc/tegra/tegra210_mvc.h | 5 + + sound/soc/tegra/tegra_pcm.c | 6 + + sound/soc/tegra/tegra_pcm.h | 1 + + sound/soc/ti/davinci-mcasp.c | 21 +- + sound/soc/ti/j721e-evm.c | 10 +- + sound/soc/uniphier/Kconfig | 2 - + sound/soc/xilinx/xlnx_spdif.c | 10 +- + 335 files changed, 14712 insertions(+), 4935 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/ak4375.yaml + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs42l42.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/cs42l42.txt + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-common.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-spdif.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,tlv320adc3xxx.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8903.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8903.txt + create mode 100644 include/dt-bindings/sound/tlv320adc3xxx.h + create mode 100644 include/linux/dma/qcom_adm.h + create mode 100644 include/linux/dma/xilinx_dpdma.h + create mode 100644 include/sound/sof/dai-amd.h + create mode 100644 include/sound/sof/dai-mediatek.h + create mode 100644 sound/soc/amd/acp-config.c + create mode 100644 sound/soc/amd/mach-config.h + create mode 100644 sound/soc/codecs/ak4375.c + rename sound/soc/codecs/{cs35l41-tables.c => cs35l41-lib.c} (56%) + create mode 100644 sound/soc/codecs/tlv320adc3xxx.c + create mode 100644 sound/soc/intel/boards/sof_nau8825.c + create mode 100644 sound/soc/sof/amd/Kconfig + create mode 100644 sound/soc/sof/amd/Makefile + create mode 100644 sound/soc/sof/amd/acp-dsp-offset.h + create mode 100644 sound/soc/sof/amd/acp-ipc.c + create mode 100644 sound/soc/sof/amd/acp-loader.c + create mode 100644 sound/soc/sof/amd/acp-pcm.c + create mode 100644 sound/soc/sof/amd/acp-stream.c + create mode 100644 sound/soc/sof/amd/acp-trace.c + create mode 100644 sound/soc/sof/amd/acp.c + create mode 100644 sound/soc/sof/amd/acp.h + create mode 100644 sound/soc/sof/amd/pci-rn.c + create mode 100644 sound/soc/sof/amd/renoir.c + delete mode 100644 sound/soc/sof/imx/imx-ops.h + create mode 100644 sound/soc/sof/mediatek/Kconfig + create mode 100644 sound/soc/sof/mediatek/Makefile + create mode 100644 sound/soc/sof/mediatek/adsp_helper.h + create mode 100644 sound/soc/sof/mediatek/mt8195/Makefile + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195-clk.c + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195-clk.h + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195-loader.c + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195.c + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195.h + create mode 100644 sound/soc/sof/sof-of-dev.h +Merging modules/modules-next (d457f9e1ae29 MAINTAINERS: Remove myself as modules maintainer) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +-- + kernel/module.c | 1 - + 2 files changed, 1 insertion(+), 3 deletions(-) +Merging input/next (08a6df090638 Input: gpio-keys - avoid clearing twice some memory) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/touchscreen/goodix.h +Auto-merging drivers/input/touchscreen/goodix.c +Merge made by the 'recursive' strategy. + drivers/input/ff-core.c | 2 +- + drivers/input/keyboard/gpio_keys.c | 2 +- + drivers/input/misc/palmas-pwrbutton.c | 9 +- + drivers/input/mouse/byd.c | 2 +- + drivers/input/touchscreen/goodix.c | 127 +++++++++++++++++++++- + drivers/input/touchscreen/goodix.h | 1 + + drivers/input/touchscreen/silead.c | 172 +++++++++++++++++++++++++++++- + drivers/input/touchscreen/ti_am335x_tsc.c | 18 +++- + drivers/input/touchscreen/ucb1400_ts.c | 4 +- + drivers/input/touchscreen/wacom_i2c.c | 44 ++++---- + 10 files changed, 339 insertions(+), 42 deletions(-) +Merging block/for-next (bb3294e22482 Merge branch 'for-5.17/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging mm/filemap.c +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/fs.h +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/nfsd/nfs4recover.c +Auto-merging fs/namei.c +Auto-merging fs/ksmbd/smb2pdu.c +Auto-merging fs/io_uring.c +Auto-merging drivers/nvme/host/nvme.h +Auto-merging drivers/nvme/host/multipath.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/md/md.c +Auto-merging drivers/block/xen-blkfront.c +Removing drivers/block/rsxx/rsxx_priv.h +Removing drivers/block/rsxx/rsxx_cfg.h +Removing drivers/block/rsxx/rsxx.h +Removing drivers/block/rsxx/dma.c +Removing drivers/block/rsxx/dev.c +Removing drivers/block/rsxx/cregs.c +Removing drivers/block/rsxx/core.c +Removing drivers/block/rsxx/config.c +Removing drivers/block/rsxx/Makefile +Auto-merging drivers/block/loop.c +Auto-merging block/ioprio.c +Auto-merging block/fops.c +Removing block/blk-exec.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/core-api/kernel-api.rst | 3 - + .../translations/zh_CN/core-api/kernel-api.rst | 2 - + MAINTAINERS | 6 - + arch/alpha/kernel/osf_sys.c | 2 +- + block/Kconfig | 3 + + block/Kconfig.iosched | 1 + + block/Makefile | 2 +- + block/bdev.c | 24 +- + block/bfq-iosched.c | 304 ++-- + block/bfq-iosched.h | 35 +- + block/bio.c | 13 +- + block/blk-cgroup.c | 1 + + block/blk-core.c | 377 +---- + block/blk-crypto-profile.c | 5 - + block/blk-exec.c | 116 -- + block/blk-flush.c | 18 +- + block/blk-integrity.c | 2 +- + block/blk-ioc.c | 318 ++-- + block/blk-ioprio.c | 13 +- + block/blk-merge.c | 18 +- + block/blk-mq-debugfs.c | 5 +- + block/blk-mq-sched.c | 29 +- + block/blk-mq-sched.h | 2 - + block/blk-mq-sysfs.c | 2 - + block/blk-mq-tag.c | 67 +- + block/blk-mq-tag.h | 2 +- + block/blk-mq.c | 985 ++++++++---- + block/blk-mq.h | 22 +- + block/blk-stat.c | 39 +- + block/blk-stat.h | 2 + + block/blk-sysfs.c | 13 +- + block/blk-throttle.c | 1 + + block/blk.h | 115 +- + block/bsg-lib.c | 2 +- + block/elevator.c | 10 +- + block/fops.c | 37 +- + block/genhd.c | 60 +- + block/ioctl.c | 31 +- + block/ioprio.c | 32 - + block/kyber-iosched.c | 1 + + block/partitions/core.c | 24 +- + drivers/block/Kconfig | 11 - + drivers/block/Makefile | 1 - + drivers/block/amiflop.c | 3 +- + drivers/block/ataflop.c | 7 +- + drivers/block/brd.c | 1 - + drivers/block/drbd/drbd_main.c | 4 +- + drivers/block/drbd/drbd_protocol.h | 6 +- + drivers/block/drbd/drbd_receiver.c | 3 +- + drivers/block/floppy.c | 13 +- + drivers/block/loop.c | 117 +- + drivers/block/loop.h | 1 + + drivers/block/mtip32xx/mtip32xx.c | 88 +- + drivers/block/n64cart.c | 2 +- + drivers/block/null_blk/main.c | 13 +- + drivers/block/null_blk/trace.h | 2 +- + drivers/block/paride/pcd.c | 5 +- + drivers/block/paride/pd.c | 6 +- + drivers/block/paride/pf.c | 5 +- + drivers/block/pktcdvd.c | 35 +- + drivers/block/ps3vram.c | 1 + + drivers/block/rbd.c | 6 +- + drivers/block/rnbd/rnbd-clt.c | 4 +- + drivers/block/rsxx/Makefile | 3 - + drivers/block/rsxx/config.c | 197 --- + drivers/block/rsxx/core.c | 1126 -------------- + drivers/block/rsxx/cregs.c | 789 ---------- + drivers/block/rsxx/dev.c | 306 ---- + drivers/block/rsxx/dma.c | 1085 ------------- + drivers/block/rsxx/rsxx.h | 33 - + drivers/block/rsxx/rsxx_cfg.h | 58 - + drivers/block/rsxx/rsxx_priv.h | 418 ----- + drivers/block/sunvdc.c | 19 +- + drivers/block/swim.c | 1 + + drivers/block/swim3.c | 2 +- + drivers/block/sx8.c | 4 +- + drivers/block/virtio_blk.c | 3 +- + drivers/block/xen-blkback/xenbus.c | 2 +- + drivers/block/xen-blkfront.c | 26 +- + drivers/block/z2ram.c | 1 + + drivers/block/zram/zram_drv.c | 1 + + drivers/cdrom/gdrom.c | 1 + + drivers/infiniband/hw/qib/qib_verbs.c | 4 +- + drivers/md/dm-mpath.c | 1 - + drivers/md/dm.c | 1 + + drivers/md/md.c | 5 - + drivers/mmc/core/block.c | 38 +- + drivers/mtd/mtd_blkdevs.c | 26 +- + drivers/mtd/ubi/block.c | 7 +- + drivers/nvme/host/core.c | 11 +- + drivers/nvme/host/fabrics.c | 22 +- + drivers/nvme/host/fault_inject.c | 2 +- + drivers/nvme/host/multipath.c | 41 +- + drivers/nvme/host/nvme.h | 8 + + drivers/nvme/host/pci.c | 147 +- + drivers/nvme/host/trace.h | 6 +- + drivers/nvme/target/passthru.c | 3 +- + drivers/scsi/ch.c | 2 +- + drivers/scsi/scsi_bsg.c | 2 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/scsi/scsi_ioctl.c | 43 +- + drivers/scsi/scsi_lib.c | 47 +- + drivers/scsi/scsi_logging.c | 4 +- + drivers/scsi/sd.c | 27 +- + drivers/scsi/sd_zbc.c | 8 +- + drivers/scsi/sg.c | 6 +- + drivers/scsi/sr.c | 17 +- + drivers/scsi/st.c | 4 +- + drivers/scsi/ufs/ufshpb.c | 4 +- + drivers/scsi/virtio_scsi.c | 2 +- + drivers/target/target_core_pscsi.c | 2 +- + drivers/usb/storage/transport.c | 2 +- + fs/ecryptfs/file.c | 2 +- + fs/exportfs/expfs.c | 2 +- + fs/internal.h | 36 + + fs/io-wq.h | 22 + + fs/io_uring.c | 1603 ++++++++++++-------- + fs/iomap/direct-io.c | 1 + + fs/ksmbd/smb2pdu.c | 3 +- + fs/ksmbd/vfs.c | 4 +- + fs/namei.c | 10 +- + fs/nfsd/nfs4recover.c | 2 +- + fs/nfsd/vfs.c | 2 +- + fs/overlayfs/readdir.c | 6 +- + fs/readdir.c | 62 +- + fs/xattr.c | 119 +- + include/linux/bio.h | 4 +- + include/linux/blk-mq.h | 55 +- + include/linux/blkdev.h | 20 +- + include/linux/fs.h | 4 +- + include/linux/genhd.h | 85 +- + include/linux/iocontext.h | 49 +- + include/linux/namei.h | 2 + + include/linux/pagemap.h | 29 + + include/linux/pktcdvd.h | 2 + + include/scsi/scsi_cmnd.h | 2 +- + include/scsi/scsi_device.h | 4 +- + include/scsi/scsi_ioctl.h | 4 +- + include/trace/events/block.h | 8 +- + include/uapi/linux/io_uring.h | 13 +- + kernel/fork.c | 26 - + kernel/trace/blktrace.c | 20 +- + mm/filemap.c | 32 +- + 143 files changed, 3239 insertions(+), 6641 deletions(-) + delete mode 100644 block/blk-exec.c + delete mode 100644 drivers/block/rsxx/Makefile + delete mode 100644 drivers/block/rsxx/config.c + delete mode 100644 drivers/block/rsxx/core.c + delete mode 100644 drivers/block/rsxx/cregs.c + delete mode 100644 drivers/block/rsxx/dev.c + delete mode 100644 drivers/block/rsxx/dma.c + delete mode 100644 drivers/block/rsxx/rsxx.h + delete mode 100644 drivers/block/rsxx/rsxx_cfg.h + delete mode 100644 drivers/block/rsxx/rsxx_priv.h +Merging device-mapper/for-next (cba23ac158db dm space map common: add bounds check to sm_ll_lookup_bitmap()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/persistent-data/dm-btree-remove.c | 173 ++++++++++++++++------- + drivers/md/persistent-data/dm-btree-spine.c | 12 +- + drivers/md/persistent-data/dm-btree.c | 8 +- + drivers/md/persistent-data/dm-space-map-common.c | 5 + + 4 files changed, 137 insertions(+), 61 deletions(-) +Merging libata/for-next (4b03d96711ba libata: use min() to make code cleaner) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/ahci.c | 2 +- + drivers/ata/libahci_platform.c | 14 +++---------- + drivers/ata/libata-sata.c | 4 ++-- + drivers/ata/libata-scsi.c | 12 +++-------- + drivers/ata/pata_ali.c | 2 +- + drivers/ata/sata_dwc_460ex.c | 45 ++++++++++++++++++++---------------------- + drivers/ata/sata_fsl.c | 16 ++++++++------- + 7 files changed, 40 insertions(+), 55 deletions(-) +Merging pcmcia/pcmcia-next (fffbcee9335c pcmcia: make pcmcia_release_io() void, as no-one is interested in return value) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Removing drivers/pcmcia/pxa2xx_cm_x2xx.c +Removing drivers/pcmcia/pxa2xx_cm_x270.c +Removing drivers/pcmcia/pxa2xx_cm_x255.c +Merge made by the 'recursive' strategy. + drivers/pcmcia/Kconfig | 2 +- + drivers/pcmcia/Makefile | 2 - + drivers/pcmcia/pcmcia_resource.c | 5 +- + drivers/pcmcia/pxa2xx_cm_x255.c | 124 --------------------------------------- + drivers/pcmcia/pxa2xx_cm_x270.c | 103 -------------------------------- + drivers/pcmcia/pxa2xx_cm_x2xx.c | 44 -------------- + drivers/pcmcia/rsrc_nonstatic.c | 6 ++ + drivers/pcmcia/yenta_socket.c | 9 +-- + 8 files changed, 11 insertions(+), 284 deletions(-) + delete mode 100644 drivers/pcmcia/pxa2xx_cm_x255.c + delete mode 100644 drivers/pcmcia/pxa2xx_cm_x270.c + delete mode 100644 drivers/pcmcia/pxa2xx_cm_x2xx.c +Merging mmc/next (356f3f2c5756 dt-bindings: mmc: synopsys-dw-mshc: integrate Altera and Imagination) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging drivers/mmc/host/jz4740_mmc.c +Auto-merging drivers/mmc/core/block.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mmc/socfpga-dw-mshc.txt +Removing Documentation/devicetree/bindings/mmc/img-dw-mshc.txt +Removing Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 3 + + .../devicetree/bindings/mmc/arm,pl18x.yaml | 19 +- + .../devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt | 53 -- + .../bindings/mmc/brcm,sdhci-brcmstb.yaml | 100 ++++ + .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 2 + + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 8 + + .../devicetree/bindings/mmc/img-dw-mshc.txt | 28 -- + .../devicetree/bindings/mmc/ingenic,mmc.yaml | 37 +- + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 6 + + .../devicetree/bindings/mmc/sdhci-am654.yaml | 2 + + .../devicetree/bindings/mmc/sdhci-msm.txt | 1 + + .../devicetree/bindings/mmc/socfpga-dw-mshc.txt | 23 - + .../bindings/mmc/socionext,uniphier-sd.yaml | 6 + + .../devicetree/bindings/mmc/synopsys-dw-mshc.yaml | 5 +- + MAINTAINERS | 7 + + drivers/mmc/core/block.c | 4 +- + drivers/mmc/core/bus.c | 11 - + drivers/mmc/core/card.h | 36 ++ + drivers/mmc/core/mmc.c | 2 +- + drivers/mmc/core/mmc_ops.c | 89 ++-- + drivers/mmc/core/mmc_ops.h | 2 +- + drivers/mmc/core/pwrseq_simple.c | 2 +- + drivers/mmc/core/queue.c | 2 +- + drivers/mmc/core/quirks.h | 64 ++- + drivers/mmc/core/sd.c | 2 +- + drivers/mmc/core/sdio.c | 5 +- + drivers/mmc/host/au1xmmc.c | 4 +- + drivers/mmc/host/dw_mmc-exynos.c | 110 ++++- + drivers/mmc/host/dw_mmc-hi3798cv200.c | 9 +- + drivers/mmc/host/dw_mmc-rockchip.c | 11 +- + drivers/mmc/host/dw_mmc.c | 56 ++- + drivers/mmc/host/dw_mmc.h | 13 + + drivers/mmc/host/jz4740_mmc.c | 19 +- + drivers/mmc/host/meson-mx-sdhc-clkc.c | 2 - + drivers/mmc/host/meson-mx-sdhc-mmc.c | 5 + + drivers/mmc/host/meson-mx-sdio.c | 5 + + drivers/mmc/host/mmc_spi.c | 16 +- + drivers/mmc/host/mmci.c | 7 +- + drivers/mmc/host/mmci_stm32_sdmmc.c | 5 +- + drivers/mmc/host/mtk-sd.c | 550 +++++++++++---------- + drivers/mmc/host/omap_hsmmc.c | 36 -- + drivers/mmc/host/sdhci-esdhc-imx.c | 4 + + drivers/mmc/host/sdhci-pci-core.c | 1 + + drivers/mmc/host/sdhci-pci-gli.c | 34 ++ + drivers/mmc/host/sdhci-pci-o2micro.c | 62 ++- + drivers/mmc/host/sdhci-pci.h | 1 + + drivers/mmc/host/tmio_mmc_core.c | 15 +- + 47 files changed, 930 insertions(+), 554 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt + create mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/img-dw-mshc.txt + delete mode 100644 Documentation/devicetree/bindings/mmc/socfpga-dw-mshc.txt +Merging mfd/for-mfd-next (8ae4069acdee dt-bindings: mfd: Add Freecom system controller) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Removing include/linux/mfd/rohm-bd70528.h +Removing drivers/mfd/rohm-bd70528.c +Removing drivers/gpio/gpio-bd70528.c +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/regulator/rohm,bd70528-regulator.txt +Removing Documentation/devicetree/bindings/regulator/max77686.txt +Removing Documentation/devicetree/bindings/mfd/rohm,bd70528-pmic.txt +Removing Documentation/devicetree/bindings/mfd/max77686.txt +Removing Documentation/devicetree/bindings/mfd/bd9571mwv.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/bd9571mwv.txt | 69 ---- + Documentation/devicetree/bindings/mfd/max77686.txt | 26 -- + .../devicetree/bindings/mfd/maxim,max77686.yaml | 132 +++++++ + .../devicetree/bindings/mfd/rohm,bd70528-pmic.txt | 102 ------ + .../devicetree/bindings/mfd/rohm,bd9571mwv.yaml | 127 +++++++ + Documentation/devicetree/bindings/mfd/syscon.yaml | 2 + + .../devicetree/bindings/regulator/max77686.txt | 71 ---- + .../bindings/regulator/maxim,max77686.yaml | 83 +++++ + .../bindings/regulator/rohm,bd70528-regulator.txt | 68 ---- + MAINTAINERS | 10 +- + drivers/gpio/Kconfig | 11 - + drivers/gpio/Makefile | 1 - + drivers/gpio/gpio-bd70528.c | 230 ------------ + drivers/mfd/Kconfig | 23 +- + drivers/mfd/Makefile | 1 - + drivers/mfd/atmel-flexcom.c | 11 +- + drivers/mfd/da9062-core.c | 12 + + drivers/mfd/intel-lpss-acpi.c | 7 +- + drivers/mfd/intel-lpss-pci.c | 9 +- + drivers/mfd/rohm-bd70528.c | 314 ----------------- + drivers/mfd/stmpe.c | 2 +- + include/linux/mfd/rohm-bd70528.h | 389 --------------------- + include/linux/mfd/rohm-generic.h | 1 - + include/linux/mfd/ti_am335x_tscadc.h | 1 - + 24 files changed, 382 insertions(+), 1320 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mfd/bd9571mwv.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/max77686.txt + create mode 100644 Documentation/devicetree/bindings/mfd/maxim,max77686.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd70528-pmic.txt + create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd9571mwv.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/max77686.txt + create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max77686.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd70528-regulator.txt + delete mode 100644 drivers/gpio/gpio-bd70528.c + delete mode 100644 drivers/mfd/rohm-bd70528.c + delete mode 100644 include/linux/mfd/rohm-bd70528.h +Merging backlight/for-backlight-next (ec961cf32411 backlight: qcom-wled: Respect enabled-strings in set_brightness) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/lp855x_bl.c | 134 ++++++++++++++++++++++++------------ + drivers/video/backlight/qcom-wled.c | 130 ++++++++++++++++++---------------- + 2 files changed, 162 insertions(+), 102 deletions(-) +Merging battery/for-next (25fd330370ac power: supply_core: Pass pointer to battery info) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-power | 2 +- + .../bindings/power/reset/gpio-poweroff.txt | 41 -- + .../bindings/power/reset/gpio-poweroff.yaml | 59 +++ + .../bindings/power/supply/maxim,max77976.yaml | 44 ++ + .../bindings/power/supply/qcom,pm8941-charger.yaml | 4 +- + MAINTAINERS | 6 + + drivers/power/reset/mt6323-poweroff.c | 3 + + drivers/power/supply/Kconfig | 12 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/ab8500-bm.h | 123 +---- + drivers/power/supply/ab8500-chargalg.h | 8 +- + drivers/power/supply/ab8500_bmdata.c | 575 +++++---------------- + drivers/power/supply/ab8500_btemp.c | 65 ++- + drivers/power/supply/ab8500_chargalg.c | 315 +++++------ + drivers/power/supply/ab8500_charger.c | 544 ++++++++++--------- + drivers/power/supply/ab8500_fg.c | 373 +++++++------ + drivers/power/supply/axp20x_battery.c | 6 +- + drivers/power/supply/bd99954-charger.c | 24 +- + drivers/power/supply/bq24190_charger.c | 6 +- + drivers/power/supply/bq2515x_charger.c | 8 +- + drivers/power/supply/bq256xx_charger.c | 24 +- + drivers/power/supply/bq25890_charger.c | 37 +- + drivers/power/supply/bq25980_charger.c | 6 +- + drivers/power/supply/bq27xxx_battery.c | 38 +- + drivers/power/supply/cw2015_battery.c | 20 +- + drivers/power/supply/ingenic-battery.c | 14 +- + drivers/power/supply/max77976_charger.c | 509 ++++++++++++++++++ + drivers/power/supply/power_supply_core.c | 80 +-- + drivers/power/supply/power_supply_sysfs.c | 1 + + drivers/power/supply/qcom_smbb.c | 5 +- + drivers/power/supply/sc2731_charger.c | 8 +- + drivers/power/supply/sc27xx_fuel_gauge.c | 22 +- + drivers/power/supply/smb347-charger.c | 34 +- + include/linux/power_supply.h | 218 +++++++- + 34 files changed, 1847 insertions(+), 1388 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/gpio-poweroff.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max77976.yaml + create mode 100644 drivers/power/supply/max77976_charger.c +Merging regulator/for-next (1f156b428586 regulator: remove redundant ret variable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging include/linux/regulator/driver.h +Auto-merging include/linux/mfd/rohm-generic.h +Auto-merging Documentation/devicetree/bindings/regulator/samsung,s5m8767.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/dlg,da9121.yaml | 76 ++++---- + .../bindings/regulator/maxim,max8973.yaml | 3 + + .../bindings/regulator/qcom,rpmh-regulator.yaml | 3 + + .../bindings/regulator/qcom,spmi-regulator.txt | 1 + + .../devicetree/bindings/regulator/regulator.yaml | 2 +- + .../bindings/regulator/samsung,s5m8767.yaml | 3 +- + drivers/regulator/Kconfig | 9 + + drivers/regulator/Makefile | 1 + + drivers/regulator/bd718x7-regulator.c | 29 +-- + drivers/regulator/da9121-regulator.c | 117 +++++++++++- + drivers/regulator/da9121-regulator.h | 21 ++- + drivers/regulator/irq_helpers.c | 41 ++++- + drivers/regulator/mt6380-regulator.c | 6 +- + drivers/regulator/qcom-labibb-regulator.c | 2 +- + drivers/regulator/qcom-rpmh-regulator.c | 27 +++ + drivers/regulator/qcom_spmi-regulator.c | 39 ++++ + drivers/regulator/rohm-regulator.c | 16 ++ + drivers/regulator/tps68470-regulator.c | 201 +++++++++++++++++++++ + drivers/regulator/twl-regulator.c | 10 +- + include/linux/mfd/rohm-generic.h | 10 +- + include/linux/regulator/driver.h | 67 +++++-- + 21 files changed, 583 insertions(+), 101 deletions(-) + create mode 100644 drivers/regulator/tps68470-regulator.c +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Already up to date. +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (875e5cc6b065 lsm: Fix kernel-doc) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Merge made by the 'recursive' strategy. + security/apparmor/include/lib.h | 5 +++++ + security/apparmor/label.c | 11 ++++++----- + security/apparmor/lsm.c | 10 +++++----- + security/apparmor/policy.c | 2 +- + security/apparmor/policy_unpack_test.c | 18 +++++++++--------- + security/apparmor/procattr.c | 2 +- + 6 files changed, 27 insertions(+), 21 deletions(-) +Merging integrity/next-integrity (9be6dc8059bb selftests/kexec: update searching for the Kconfig) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'recursive' strategy. + include/linux/ima.h | 30 +++++++++++----------- + security/integrity/platform_certs/load_uefi.c | 5 ++++ + tools/testing/selftests/kexec/kexec_common_lib.sh | 13 +++++++--- + .../selftests/kexec/test_kexec_file_load.sh | 5 ++-- + 4 files changed, 32 insertions(+), 21 deletions(-) +Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Auto-merging security/integrity/platform_certs/load_uefi.c +CONFLICT (content): Merge conflict in security/integrity/platform_certs/load_uefi.c +Auto-merging scripts/Makefile +Auto-merging include/keys/system_keyring.h +Auto-merging certs/system_keyring.c +CONFLICT (content): Merge conflict in certs/system_keyring.c +Auto-merging certs/Makefile +Auto-merging certs/Kconfig +Resolved 'certs/system_keyring.c' using previous resolution. +Resolved 'security/integrity/platform_certs/load_uefi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6c686c1d696d] Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git +$ git diff -M --stat --summary HEAD^.. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (6cd9d4b97891 selinux: minor tweaks to selinux_add_opt()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/selinux/hooks.c +Auto-merging security/apparmor/lsm.c +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + include/linux/lsm_hook_defs.h | 5 +-- + include/linux/lsm_hooks.h | 10 ++--- + include/linux/security.h | 12 +---- + kernel/audit.c | 4 +- + kernel/auditfilter.c | 3 +- + kernel/auditsc.c | 11 ++++- + net/netlabel/netlabel_unlabeled.c | 2 +- + net/netlabel/netlabel_user.h | 2 +- + security/apparmor/lsm.c | 13 ++++-- + security/integrity/ima/ima_appraise.c | 2 +- + security/integrity/ima/ima_main.c | 14 +++--- + security/security.c | 14 ++---- + security/selinux/hooks.c | 84 +++++++++-------------------------- + security/selinux/ss/sidtab.c | 2 +- + security/selinux/xfrm.c | 4 +- + security/smack/smack.h | 16 ------- + security/smack/smack_lsm.c | 9 ++-- + 17 files changed, 70 insertions(+), 137 deletions(-) +Merging smack/next (0934ad42bb2c smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (f702e1107601 tomoyo: use hwight16() in tomoyo_domain_quota_is_ok()) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Already up to date. +Merging tpmdd/next (035d19ee9b90 tpm: fix NPE on probe for missing device) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'recursive' strategy. + crypto/asymmetric_keys/asymmetric_type.c | 57 ++++++++++---- + crypto/asymmetric_keys/pkcs7_trust.c | 6 +- + crypto/asymmetric_keys/restrict.c | 48 +++++++----- + crypto/asymmetric_keys/x509_cert_parser.c | 10 +++ + crypto/asymmetric_keys/x509_public_key.c | 10 +++ + drivers/char/tpm/st33zp24/st33zp24.c | 122 +++++------------------------- + drivers/char/tpm/tpm-chip.c | 37 ++++++--- + drivers/char/tpm/tpm-sysfs.c | 3 + + drivers/char/tpm/tpm2-cmd.c | 6 ++ + drivers/char/tpm/tpm_tis_core.c | 14 +++- + drivers/char/tpm/tpm_tis_i2c_cr50.c | 16 +++- + drivers/char/tpm/tpm_tis_spi_cr50.c | 20 ++++- + include/crypto/public_key.h | 2 +- + include/keys/asymmetric-type.h | 3 +- + include/linux/tpm.h | 10 +++ + 15 files changed, 205 insertions(+), 159 deletions(-) +Merging watchdog/master (0c2d62421b5b watchdog: msc313e: Check if the WDT was running at boot) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Removing drivers/watchdog/bcm63xx_wdt.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt +Merge made by the 'recursive' strategy. + .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 3 + + .../bindings/watchdog/brcm,bcm7038-wdt.txt | 19 - + .../bindings/watchdog/brcm,bcm7038-wdt.yaml | 43 +++ + .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 7 +- + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 2 + + .../bindings/watchdog/realtek,otto-wdt.yaml | 91 +++++ + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 75 +++- + .../devicetree/bindings/watchdog/samsung-wdt.yaml | 48 ++- + MAINTAINERS | 7 + + arch/mips/bcm63xx/dev-wdt.c | 8 + + drivers/watchdog/Kconfig | 98 ++++-- + drivers/watchdog/Makefile | 4 +- + drivers/watchdog/apple_wdt.c | 226 ++++++++++++ + drivers/watchdog/bcm63xx_wdt.c | 317 ----------------- + drivers/watchdog/bcm7038_wdt.c | 15 +- + drivers/watchdog/da9063_wdt.c | 12 +- + drivers/watchdog/davinci_wdt.c | 2 +- + drivers/watchdog/f71808e_wdt.c | 10 +- + drivers/watchdog/meson_gxbb_wdt.c | 1 - + drivers/watchdog/msc313e_wdt.c | 4 + + drivers/watchdog/mtk_wdt.c | 2 +- + drivers/watchdog/realtek_otto_wdt.c | 384 +++++++++++++++++++++ + drivers/watchdog/rzg2l_wdt.c | 263 ++++++++++++++ + drivers/watchdog/s3c2410_wdt.c | 338 +++++++++++++----- + include/linux/platform_data/bcm7038_wdt.h | 8 + + 25 files changed, 1495 insertions(+), 492 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/realtek,otto-wdt.yaml + create mode 100644 drivers/watchdog/apple_wdt.c + delete mode 100644 drivers/watchdog/bcm63xx_wdt.c + create mode 100644 drivers/watchdog/realtek_otto_wdt.c + create mode 100644 drivers/watchdog/rzg2l_wdt.c + create mode 100644 include/linux/platform_data/bcm7038_wdt.h +Merging iommu/next (66dc1b791c58 Merge branches 'arm/smmu', 'virtio', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iommu/arm,smmu.yaml | 2 + + drivers/iommu/amd/amd_iommu_types.h | 2 - + drivers/iommu/amd/init.c | 109 ++++---- + drivers/iommu/amd/io_pgtable.c | 110 +++------ + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 2 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 5 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 3 +- + drivers/iommu/dma-iommu.c | 274 ++++++++++++++++----- + drivers/iommu/intel/iommu.c | 111 +++------ + drivers/iommu/io-pgtable-arm-v7s.c | 6 +- + drivers/iommu/io-pgtable-arm.c | 9 +- + drivers/iommu/iommu.c | 3 +- + drivers/iommu/iova.c | 209 +--------------- + drivers/iommu/virtio-iommu.c | 115 +++++++-- + drivers/vdpa/vdpa_user/iova_domain.c | 8 - + include/linux/intel-svm.h | 6 - + include/linux/iommu.h | 3 +- + include/linux/iova.h | 68 +---- + include/trace/events/iommu.h | 10 +- + include/uapi/linux/virtio_iommu.h | 8 +- + 20 files changed, 493 insertions(+), 570 deletions(-) +Merging audit/next (ed98ea2128b6 audit: replace zero-length array with flexible-array member) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Auto-merging kernel/auditfilter.c +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + include/uapi/linux/audit.h | 2 +- + kernel/audit.c | 22 +++++++++++++++++++--- + kernel/audit_tree.c | 2 +- + kernel/auditfilter.c | 4 ++-- + 4 files changed, 23 insertions(+), 7 deletions(-) +Merging devicetree/for-next (7821f3a0b525 dt-bindings: crypto: convert Qualcomm PRNG to yaml) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging include/linux/of_fdt.h +CONFLICT (content): Merge conflict in include/linux/of_fdt.h +Auto-merging drivers/of/fdt.c +Auto-merging arch/powerpc/mm/nohash/kaslr_booke.c +Auto-merging arch/powerpc/kernel/prom.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/usb/brcm,bdc.txt +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Removing Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt +Removing Documentation/devicetree/bindings/rtc/brcm,brcmstb-waketimer.txt +Removing Documentation/devicetree/bindings/rng/brcm,iproc-rng200.txt +Removing Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt +Removing Documentation/devicetree/bindings/reserved-memory/qcom,rmtfs-mem.txt +Removing Documentation/devicetree/bindings/reserved-memory/qcom,cmd-db.txt +Removing Documentation/devicetree/bindings/pwm/brcm,bcm7038-pwm.txt +Removing Documentation/devicetree/bindings/power/reset/gpio-restart.txt +Removing Documentation/devicetree/bindings/phy/brcm,mdio-mux-bus-pci.txt +Removing Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt +Removing Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt +Removing Documentation/devicetree/bindings/net/macb.txt +Removing Documentation/devicetree/bindings/net/brcm,systemport.txt +Removing Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt +Removing Documentation/devicetree/bindings/net/brcm,bcmgenet.txt +Removing Documentation/devicetree/bindings/net/brcm,amac.txt +Auto-merging Documentation/devicetree/bindings/memory-controllers/ti,gpmc.yaml +Removing Documentation/devicetree/bindings/leds/leds-bcm6328.txt +Removing Documentation/devicetree/bindings/interrupt-controller/brcm,l2-intc.txt +Removing Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt +Removing Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt +Removing Documentation/devicetree/bindings/interrupt-controller/brcm,bcm3380-l2-intc.txt +Removing Documentation/devicetree/bindings/input/pwm-vibrator.txt +Removing Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt +Removing Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt +Removing Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.txt +Removing Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt +Removing Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt +Removing Documentation/devicetree/bindings/crypto/qcom,prng.txt +Removing Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt +Removing Documentation/devicetree/bindings/ata/brcm,sata-brcm.txt +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Removing Documentation/devicetree/bindings/arm/arm-dsu-pmu.txt +Resolved 'include/linux/of_fdt.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3a7b8154bcb3] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/Makefile | 4 +- + .../devicetree/bindings/arm/arm,cci-400.yaml | 10 - + .../devicetree/bindings/arm/arm-dsu-pmu.txt | 27 -- + Documentation/devicetree/bindings/arm/cpus.yaml | 7 + + Documentation/devicetree/bindings/arm/pmu.yaml | 8 + + Documentation/devicetree/bindings/arm/ux500.yaml | 30 ++ + .../devicetree/bindings/ata/brcm,sata-brcm.txt | 45 --- + .../devicetree/bindings/ata/brcm,sata-brcm.yaml | 90 +++++ + .../devicetree/bindings/bus/brcm,gisb-arb.txt | 34 -- + .../devicetree/bindings/bus/brcm,gisb-arb.yaml | 66 ++++ + .../devicetree/bindings/crypto/qcom,prng.txt | 19 - + .../devicetree/bindings/crypto/qcom,prng.yaml | 43 +++ + .../bindings/display/msm/dpu-sdm845.yaml | 5 +- + .../bindings/display/simple-framebuffer.yaml | 12 + + .../bindings/dma/sifive,fu540-c000-pdma.yaml | 2 +- + .../devicetree/bindings/gpio/brcm,brcmstb-gpio.txt | 83 ----- + .../bindings/gpio/brcm,brcmstb-gpio.yaml | 104 ++++++ + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 45 ++- + .../devicetree/bindings/i2c/i2c-gate.yaml | 2 +- + .../devicetree/bindings/i2c/i2c-mux-gpio.txt | 80 ---- + .../devicetree/bindings/i2c/i2c-mux-gpio.yaml | 104 ++++++ + .../devicetree/bindings/i2c/i2c-mux-pinctrl.txt | 93 ----- + .../devicetree/bindings/i2c/i2c-mux-pinctrl.yaml | 103 ++++++ + .../bindings/i2c/nvidia,tegra186-bpmp-i2c.txt | 42 --- + .../bindings/i2c/nvidia,tegra186-bpmp-i2c.yaml | 45 +++ + .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 87 ----- + .../bindings/i2c/nvidia,tegra20-i2c.yaml | 192 ++++++++++ + .../bindings/iio/gyroscope/invensense,mpu3050.yaml | 2 +- + .../bindings/iio/imu/invensense,mpu6050.yaml | 2 +- + .../devicetree/bindings/input/pwm-vibrator.txt | 66 ---- + .../devicetree/bindings/input/pwm-vibrator.yaml | 57 +++ + .../interrupt-controller/brcm,bcm3380-l2-intc.txt | 39 -- + .../interrupt-controller/brcm,bcm7038-l1-intc.txt | 61 ---- + .../interrupt-controller/brcm,bcm7038-l1-intc.yaml | 91 +++++ + .../interrupt-controller/brcm,bcm7120-l2-intc.txt | 88 ----- + .../interrupt-controller/brcm,bcm7120-l2-intc.yaml | 151 ++++++++ + .../bindings/interrupt-controller/brcm,l2-intc.txt | 31 -- + .../interrupt-controller/brcm,l2-intc.yaml | 72 ++++ + .../devicetree/bindings/leds/leds-bcm6328.txt | 319 ---------------- + .../devicetree/bindings/leds/leds-bcm6328.yaml | 404 +++++++++++++++++++++ + .../bindings/memory-controllers/ti,gpmc.yaml | 5 +- + .../devicetree/bindings/net/brcm,amac.txt | 30 -- + .../devicetree/bindings/net/brcm,amac.yaml | 88 +++++ + .../devicetree/bindings/net/brcm,bcmgenet.txt | 125 ------- + .../devicetree/bindings/net/brcm,bcmgenet.yaml | 145 ++++++++ + .../bindings/net/brcm,mdio-mux-iproc.txt | 62 ---- + .../bindings/net/brcm,mdio-mux-iproc.yaml | 80 ++++ + .../devicetree/bindings/net/brcm,systemport.txt | 38 -- + .../devicetree/bindings/net/brcm,systemport.yaml | 86 +++++ + .../devicetree/bindings/net/brcm,unimac-mdio.yaml | 3 +- + .../devicetree/bindings/net/cdns,macb.yaml | 159 ++++++++ + .../bindings/net/ethernet-controller.yaml | 5 +- + Documentation/devicetree/bindings/net/macb.txt | 60 --- + .../devicetree/bindings/pci/brcm,iproc-pcie.txt | 133 ------- + .../devicetree/bindings/pci/brcm,iproc-pcie.yaml | 184 ++++++++++ + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 1 + + .../devicetree/bindings/pci/cdns,cdns-pcie-ep.yaml | 1 - + .../devicetree/bindings/pci/cdns-pcie-ep.yaml | 1 + + .../bindings/pci/hisilicon,kirin-pcie.yaml | 13 + + .../bindings/pci/mediatek,mt7621-pcie.yaml | 3 + + .../bindings/pci/mediatek-pcie-gen3.yaml | 4 + + .../bindings/pci/microchip,pcie-host.yaml | 18 + + .../devicetree/bindings/pci/sifive,fu740-pcie.yaml | 4 +- + .../devicetree/bindings/pci/snps,dw-pcie-ep.yaml | 2 +- + .../devicetree/bindings/pci/snps,dw-pcie.yaml | 2 +- + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 2 +- + .../devicetree/bindings/pci/ti,am65-pci-ep.yaml | 2 - + .../devicetree/bindings/pci/ti,am65-pci-host.yaml | 4 +- + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 2 + + .../devicetree/bindings/perf/arm,dsu-pmu.yaml | 45 +++ + .../bindings/phy/brcm,cygnus-pcie-phy.txt | 47 --- + .../bindings/phy/brcm,cygnus-pcie-phy.yaml | 76 ++++ + .../bindings/phy/brcm,mdio-mux-bus-pci.txt | 27 -- + .../devicetree/bindings/phy/brcm,ns2-pcie-phy.yaml | 41 +++ + .../bindings/power/reset/gpio-restart.txt | 54 --- + .../bindings/power/reset/gpio-restart.yaml | 86 +++++ + .../devicetree/bindings/pwm/brcm,bcm7038-pwm.txt | 20 - + .../devicetree/bindings/pwm/brcm,bcm7038-pwm.yaml | 43 +++ + .../bindings/reserved-memory/qcom,cmd-db.txt | 37 -- + .../bindings/reserved-memory/qcom,cmd-db.yaml | 46 +++ + .../bindings/reserved-memory/qcom,rmtfs-mem.txt | 51 --- + .../bindings/reserved-memory/qcom,rmtfs-mem.yaml | 53 +++ + .../bindings/reset/brcm,brcmstb-reset.txt | 27 -- + .../bindings/reset/brcm,brcmstb-reset.yaml | 48 +++ + .../devicetree/bindings/rng/brcm,iproc-rng200.txt | 16 - + .../devicetree/bindings/rng/brcm,iproc-rng200.yaml | 30 ++ + .../bindings/rtc/brcm,brcmstb-waketimer.txt | 20 - + .../bindings/rtc/brcm,brcmstb-waketimer.yaml | 44 +++ + .../devicetree/bindings/serial/pl011.yaml | 3 + + .../devicetree/bindings/thermal/brcm,avs-tmon.txt | 23 -- + .../devicetree/bindings/thermal/brcm,avs-tmon.yaml | 56 +++ + .../devicetree/bindings/thermal/thermal-zones.yaml | 9 +- + .../devicetree/bindings/trivial-devices.yaml | 9 + + Documentation/devicetree/bindings/usb/brcm,bdc.txt | 29 -- + .../devicetree/bindings/usb/brcm,bdc.yaml | 50 +++ + .../bindings/usb/intel,keembay-dwc3.yaml | 3 + + .../devicetree/bindings/usb/snps,dwc3.yaml | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../devicetree/bindings/watchdog/ti,rti-wdt.yaml | 6 - + MAINTAINERS | 11 +- + arch/mips/ralink/of.c | 19 +- + arch/powerpc/kernel/prom.c | 27 +- + arch/powerpc/mm/nohash/kaslr_booke.c | 4 +- + drivers/of/base.c | 27 ++ + drivers/of/fdt.c | 121 +++--- + drivers/of/property.c | 17 +- + drivers/of/unittest.c | 21 +- + include/linux/of_fdt.h | 9 +- + 108 files changed, 3219 insertions(+), 2071 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/arm-dsu-pmu.txt + delete mode 100644 Documentation/devicetree/bindings/ata/brcm,sata-brcm.txt + create mode 100644 Documentation/devicetree/bindings/ata/brcm,sata-brcm.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt + create mode 100644 Documentation/devicetree/bindings/bus/brcm,gisb-arb.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/qcom,prng.txt + create mode 100644 Documentation/devicetree/bindings/crypto/qcom,prng.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt + create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt + create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/input/pwm-vibrator.txt + create mode 100644 Documentation/devicetree/bindings/input/pwm-vibrator.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm3380-l2-intc.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,l2-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,l2-intc.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/leds-bcm6328.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm6328.yaml + delete mode 100644 Documentation/devicetree/bindings/net/brcm,amac.txt + create mode 100644 Documentation/devicetree/bindings/net/brcm,amac.yaml + delete mode 100644 Documentation/devicetree/bindings/net/brcm,bcmgenet.txt + create mode 100644 Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml + delete mode 100644 Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt + create mode 100644 Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.yaml + delete mode 100644 Documentation/devicetree/bindings/net/brcm,systemport.txt + create mode 100644 Documentation/devicetree/bindings/net/brcm,systemport.yaml + create mode 100644 Documentation/devicetree/bindings/net/cdns,macb.yaml + delete mode 100644 Documentation/devicetree/bindings/net/macb.txt + delete mode 100644 Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/brcm,mdio-mux-bus-pci.txt + create mode 100644 Documentation/devicetree/bindings/phy/brcm,ns2-pcie-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/power/reset/gpio-restart.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/gpio-restart.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/brcm,bcm7038-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/brcm,bcm7038-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/reserved-memory/qcom,cmd-db.txt + create mode 100644 Documentation/devicetree/bindings/reserved-memory/qcom,cmd-db.yaml + delete mode 100644 Documentation/devicetree/bindings/reserved-memory/qcom,rmtfs-mem.txt + create mode 100644 Documentation/devicetree/bindings/reserved-memory/qcom,rmtfs-mem.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/rng/brcm,iproc-rng200.txt + create mode 100644 Documentation/devicetree/bindings/rng/brcm,iproc-rng200.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/brcm,brcmstb-waketimer.txt + create mode 100644 Documentation/devicetree/bindings/rtc/brcm,brcmstb-waketimer.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt + create mode 100644 Documentation/devicetree/bindings/thermal/brcm,avs-tmon.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/brcm,bdc.txt + create mode 100644 Documentation/devicetree/bindings/usb/brcm,bdc.yaml +Merging mailbox/mailbox-for-next (97961f78e8bc mailbox: imx: support i.MX8ULP S4 MU) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (ebe33e5a98dc spi: ar934x: fix transfer size) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Removing include/linux/platform_data/spi-clps711x.h +Removing Documentation/devicetree/bindings/spi/atmel-quadspi.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 3 +- + .../devicetree/bindings/spi/atmel,quadspi.yaml | 99 +++++++++++ + .../devicetree/bindings/spi/atmel-quadspi.txt | 37 ---- + .../spi/cdns,qspi-nor-peripheral-props.yaml | 42 +++++ + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 33 ---- + .../bindings/spi/mediatek,spi-mtk-nor.yaml | 6 +- + .../devicetree/bindings/spi/renesas,rspi.yaml | 4 +- + .../devicetree/bindings/spi/spi-controller.yaml | 69 +------- + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 11 +- + .../bindings/spi/spi-peripheral-props.yaml | 89 ++++++++++ + .../devicetree/bindings/spi/spi-pl022.yaml | 3 + + Documentation/spi/pxa2xx.rst | 35 +--- + Documentation/spi/spidev.rst | 58 +++++-- + arch/arm/mach-pxa/lubbock.c | 15 +- + arch/arm/mach-pxa/stargate2.c | 2 +- + drivers/spi/Kconfig | 11 +- + drivers/spi/spi-ar934x.c | 18 +- + drivers/spi/spi-atmel.c | 36 ++-- + drivers/spi/spi-bcm-qspi.c | 44 ++++- + drivers/spi/spi-dln2.c | 4 +- + drivers/spi/spi-dw-bt1.c | 9 +- + drivers/spi/spi-dw-core.c | 179 ++++++++++--------- + drivers/spi/spi-dw-dma.c | 55 +++--- + drivers/spi/spi-dw-mmio.c | 22 +-- + drivers/spi/spi-dw-pci.c | 60 +++---- + drivers/spi/spi-dw.h | 182 ++++++++++--------- + drivers/spi/spi-fsl-lpspi.c | 6 +- + drivers/spi/spi-geni-qcom.c | 4 - + drivers/spi/spi-hisi-kunpeng.c | 15 +- + drivers/spi/spi-pxa2xx.c | 61 +------ + drivers/spi/spi-pxa2xx.h | 7 - + drivers/spi/spi-rspi.c | 27 ++- + drivers/spi/spi-tegra210-quad.c | 11 +- + drivers/spi/spi-xlp.c | 8 - + drivers/spi/spi.c | 193 +++++++++++---------- + drivers/spi/spidev.c | 9 +- + include/linux/platform_data/spi-clps711x.h | 17 -- + include/linux/spi/pxa2xx_spi.h | 5 - + 38 files changed, 811 insertions(+), 678 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/atmel,quadspi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/atmel-quadspi.txt + create mode 100644 Documentation/devicetree/bindings/spi/cdns,qspi-nor-peripheral-props.yaml + create mode 100644 Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml + delete mode 100644 include/linux/platform_data/spi-clps711x.h +Merging tip/auto-latest (30fddd0b8484 Merge ras/core into tip/master) +$ git merge -m Merge branch 'auto-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/auto-latest +Auto-merging kernel/events/core.c +Auto-merging init/Kconfig +Auto-merging include/linux/perf_event.h +Auto-merging include/linux/pci.h +Auto-merging drivers/perf/arm_smmuv3_pmu.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/net/wireless/ath/ath11k/pci.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/intel/iavf/iavf_main.c +Auto-merging drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +Auto-merging drivers/net/ethernet/cisco/enic/enic_main.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/base/core.c +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging arch/x86/kernel/amd_nb.c +Auto-merging arch/x86/events/core.c +Auto-merging arch/um/kernel/skas/uaccess.c +Auto-merging arch/um/Kconfig +Auto-merging arch/s390/pci/pci_irq.c +Auto-merging arch/powerpc/sysdev/mpic_u3msi.c +Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c +Auto-merging arch/powerpc/platforms/pasemi/msi.c +Removing arch/powerpc/platforms/4xx/msi.c +Auto-merging arch/powerpc/kernel/interrupt.c +Auto-merging arch/microblaze/kernel/signal.c +Auto-merging arch/m68k/Kconfig +Removing arch/arm64/kvm/perf.c +Auto-merging arch/arm64/kernel/ptrace.c +Auto-merging arch/arm64/kernel/perf_callchain.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/perf_callchain.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging Makefile +Resolved 'arch/arm64/kernel/perf_callchain.c' using previous resolution. +Resolved 'drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ef61f1f11232] Merge branch 'auto-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + .clang-format | 1 - + Documentation/ABI/stable/sysfs-devices-node | 6 + + Documentation/driver-api/pci/pci.rst | 2 +- + Documentation/firmware-guide/acpi/apei/einj.rst | 19 + + Documentation/x86/sgx.rst | 14 +- + Makefile | 11 - + arch/Kconfig | 4 + + arch/alpha/include/asm/spinlock_types.h | 2 +- + arch/alpha/kernel/signal.c | 2 +- + arch/arc/Kconfig | 1 - + arch/arm/Kconfig | 1 - + arch/arm/include/asm/spinlock_types.h | 2 +- + arch/arm/kernel/perf_callchain.c | 28 +- + arch/arm/kernel/signal.c | 2 +- + arch/arm/mm/alignment.c | 2 +- + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/kvm_host.h | 11 +- + arch/arm64/include/asm/spinlock_types.h | 2 +- + arch/arm64/kernel/entry-common.c | 2 +- + arch/arm64/kernel/image-vars.h | 2 + + arch/arm64/kernel/perf_callchain.c | 13 +- + arch/arm64/kernel/ptrace.c | 4 +- + arch/arm64/kernel/signal.c | 2 +- + arch/arm64/kernel/syscall.c | 4 +- + arch/arm64/kvm/Kconfig | 1 + + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/arm.c | 10 +- + arch/arm64/kvm/perf.c | 59 -- + arch/arm64/kvm/pmu-emul.c | 2 + + arch/csky/Kconfig | 1 - + arch/csky/include/asm/spinlock_types.h | 2 +- + arch/csky/kernel/perf_callchain.c | 10 - + arch/hexagon/include/asm/spinlock_types.h | 2 +- + arch/ia64/include/asm/spinlock_types.h | 2 +- + arch/m68k/Kconfig | 1 - + arch/microblaze/kernel/signal.c | 2 +- + arch/mips/include/asm/futex.h | 27 +- + arch/mips/pci/msi-octeon.c | 32 +- + arch/nds32/kernel/perf_event_cpu.c | 29 +- + arch/openrisc/kernel/signal.c | 2 +- + arch/powerpc/boot/dts/bluestone.dts | 25 - + arch/powerpc/boot/dts/canyonlands.dts | 18 - + arch/powerpc/boot/dts/katmai.dts | 18 - + arch/powerpc/boot/dts/kilauea.dts | 28 - + arch/powerpc/boot/dts/redwood.dts | 19 - + arch/powerpc/include/asm/simple_spinlock_types.h | 2 +- + arch/powerpc/include/asm/spinlock_types.h | 2 +- + arch/powerpc/kernel/interrupt.c | 15 +- + arch/powerpc/kernel/ptrace/ptrace.c | 3 +- + arch/powerpc/platforms/40x/Kconfig | 1 - + arch/powerpc/platforms/44x/Kconfig | 4 - + arch/powerpc/platforms/4xx/Makefile | 1 - + arch/powerpc/platforms/4xx/hsta_msi.c | 7 +- + arch/powerpc/platforms/4xx/msi.c | 281 ------ + arch/powerpc/platforms/cell/axon_msi.c | 12 +- + arch/powerpc/platforms/pasemi/msi.c | 9 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 4 +- + arch/powerpc/platforms/pseries/msi.c | 38 +- + arch/powerpc/sysdev/Kconfig | 6 - + arch/powerpc/sysdev/fsl_msi.c | 8 +- + arch/powerpc/sysdev/mpic_u3msi.c | 9 +- + arch/riscv/Kconfig | 1 - + arch/riscv/include/asm/spinlock_types.h | 2 +- + arch/riscv/kernel/perf_callchain.c | 10 - + arch/s390/Kconfig | 1 - + arch/s390/include/asm/spinlock_types.h | 2 +- + arch/s390/pci/pci_irq.c | 10 +- + arch/sh/Kconfig | 1 - + arch/sh/include/asm/spinlock_types.h | 2 +- + arch/sparc/kernel/pci_msi.c | 4 +- + arch/um/Kconfig | 1 - + arch/um/kernel/skas/uaccess.c | 1 - + arch/x86/Kconfig | 26 +- + arch/x86/Kconfig.cpu | 4 - + arch/x86/Makefile | 16 + + arch/x86/boot/compressed/Makefile | 7 +- + arch/x86/boot/compressed/efi_thunk_64.S | 2 +- + arch/x86/boot/compressed/head_64.S | 8 +- + arch/x86/boot/compressed/mem_encrypt.S | 6 +- + arch/x86/boot/compressed/sev.c | 6 +- + arch/x86/boot/string.h | 3 + + arch/x86/configs/i386_defconfig | 1 - + arch/x86/configs/x86_64_defconfig | 1 - + arch/x86/crypto/aegis128-aesni-asm.S | 48 +- + arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 2 +- + arch/x86/crypto/aesni-intel_asm.S | 56 +- + arch/x86/crypto/aesni-intel_avx-x86_64.S | 40 +- + arch/x86/crypto/blake2s-core.S | 4 +- + arch/x86/crypto/blowfish-x86_64-asm_64.S | 12 +- + arch/x86/crypto/camellia-aesni-avx-asm_64.S | 14 +- + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 14 +- + arch/x86/crypto/camellia-x86_64-asm_64.S | 12 +- + arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 12 +- + arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 10 +- + arch/x86/crypto/chacha-avx2-x86_64.S | 6 +- + arch/x86/crypto/chacha-avx512vl-x86_64.S | 6 +- + arch/x86/crypto/chacha-ssse3-x86_64.S | 8 +- + arch/x86/crypto/crc32-pclmul_asm.S | 2 +- + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 2 +- + arch/x86/crypto/crct10dif-pcl-asm_64.S | 2 +- + arch/x86/crypto/des3_ede-asm_64.S | 4 +- + arch/x86/crypto/ghash-clmulni-intel_asm.S | 6 +- + arch/x86/crypto/nh-avx2-x86_64.S | 2 +- + arch/x86/crypto/nh-sse2-x86_64.S | 2 +- + arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 10 +- + arch/x86/crypto/serpent-avx2-asm_64.S | 10 +- + arch/x86/crypto/serpent-sse2-i586-asm_32.S | 6 +- + arch/x86/crypto/serpent-sse2-x86_64-asm_64.S | 6 +- + arch/x86/crypto/sha1_avx2_x86_64_asm.S | 2 +- + arch/x86/crypto/sha1_ni_asm.S | 2 +- + arch/x86/crypto/sha1_ssse3_asm.S | 2 +- + arch/x86/crypto/sha256-avx-asm.S | 2 +- + arch/x86/crypto/sha256-avx2-asm.S | 2 +- + arch/x86/crypto/sha256-ssse3-asm.S | 2 +- + arch/x86/crypto/sha256_ni_asm.S | 2 +- + arch/x86/crypto/sha512-avx-asm.S | 2 +- + arch/x86/crypto/sha512-avx2-asm.S | 2 +- + arch/x86/crypto/sha512-ssse3-asm.S | 2 +- + arch/x86/crypto/sm4-aesni-avx-asm_64.S | 12 +- + arch/x86/crypto/sm4-aesni-avx2-asm_64.S | 8 +- + arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 10 +- + arch/x86/crypto/twofish-i586-asm_32.S | 4 +- + arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 6 +- + arch/x86/crypto/twofish-x86_64-asm_64.S | 4 +- + arch/x86/entry/entry_32.S | 30 +- + arch/x86/entry/entry_64.S | 23 +- + arch/x86/entry/thunk_32.S | 2 +- + arch/x86/entry/thunk_64.S | 2 +- + arch/x86/entry/vdso/Makefile | 2 +- + arch/x86/entry/vdso/vdso-layout.lds.S | 1 - + arch/x86/entry/vdso/vdso32/system_call.S | 2 +- + arch/x86/entry/vdso/vsgx.S | 2 +- + arch/x86/entry/vsyscall/vsyscall_emu_64.S | 6 +- + arch/x86/events/amd/iommu.c | 2 +- + arch/x86/events/core.c | 13 +- + arch/x86/events/intel/core.c | 5 +- + arch/x86/hyperv/irqdomain.c | 55 +- + arch/x86/include/asm/amd_nb.h | 1 - + arch/x86/include/asm/asm.h | 37 + + arch/x86/include/asm/extable.h | 6 +- + arch/x86/include/asm/extable_fixup_types.h | 50 +- + arch/x86/include/asm/fpu/signal.h | 3 - + arch/x86/include/asm/futex.h | 28 +- + arch/x86/include/asm/insn-eval.h | 15 + + arch/x86/include/asm/io.h | 20 +- + arch/x86/include/asm/irqflags.h | 7 +- + arch/x86/include/asm/kvm_host.h | 7 +- + arch/x86/include/asm/linkage.h | 14 + + arch/x86/include/asm/mce.h | 28 +- + arch/x86/include/asm/mmx.h | 15 - + arch/x86/include/asm/msr.h | 26 +- + arch/x86/include/asm/mtrr.h | 8 +- + arch/x86/include/asm/page_32.h | 14 - + arch/x86/include/asm/page_64.h | 1 + + arch/x86/include/asm/paravirt.h | 7 +- + arch/x86/include/asm/pgtable.h | 1 + + arch/x86/include/asm/processor.h | 8 + + arch/x86/include/asm/qspinlock_paravirt.h | 4 +- + arch/x86/include/asm/realmode.h | 1 + + arch/x86/include/asm/required-features.h | 4 - + arch/x86/include/asm/segment.h | 9 +- + arch/x86/include/asm/set_memory.h | 4 + + arch/x86/include/asm/sev-common.h | 55 +- + arch/x86/include/asm/sgx.h | 18 + + arch/x86/include/asm/static_call.h | 2 +- + arch/x86/include/asm/string_32.h | 33 - + arch/x86/include/asm/tlbflush.h | 5 + + arch/x86/include/asm/uaccess.h | 44 +- + arch/x86/include/asm/word-at-a-time.h | 66 +- + arch/x86/include/asm/x86_init.h | 6 - + arch/x86/include/asm/xen/hypervisor.h | 8 + + arch/x86/include/asm/xen/page.h | 14 +- + arch/x86/kernel/acpi/wakeup_32.S | 6 +- + arch/x86/kernel/alternative.c | 51 +- + arch/x86/kernel/amd_nb.c | 49 +- + arch/x86/kernel/apic/msi.c | 11 +- + arch/x86/kernel/cc_platform.c | 8 + + arch/x86/kernel/cpu/common.c | 17 +- + arch/x86/kernel/cpu/mce/amd.c | 280 ++---- + arch/x86/kernel/cpu/mce/core.c | 149 +++- + arch/x86/kernel/cpu/mce/inject.c | 46 +- + arch/x86/kernel/cpu/mce/internal.h | 2 + + arch/x86/kernel/cpu/mce/severity.c | 41 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 2 +- + arch/x86/kernel/cpu/sgx/encls.h | 36 +- + arch/x86/kernel/cpu/sgx/main.c | 133 ++- + arch/x86/kernel/cpu/sgx/sgx.h | 8 +- + arch/x86/kernel/fpu/core.c | 21 +- + arch/x86/kernel/fpu/legacy.h | 6 +- + arch/x86/kernel/fpu/xstate.h | 6 +- + arch/x86/kernel/ftrace.c | 2 +- + arch/x86/kernel/ftrace_32.S | 6 +- + arch/x86/kernel/ftrace_64.S | 8 +- + arch/x86/kernel/head64.c | 74 +- + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/head_64.S | 19 +- + arch/x86/kernel/irqflags.S | 2 +- + arch/x86/kernel/kprobes/core.c | 2 +- + arch/x86/kernel/paravirt.c | 4 +- + arch/x86/kernel/process.c | 8 +- + arch/x86/kernel/process.h | 4 +- + arch/x86/kernel/reboot.c | 12 +- + arch/x86/kernel/relocate_kernel_32.S | 10 +- + arch/x86/kernel/relocate_kernel_64.S | 10 +- + arch/x86/kernel/setup.c | 7 +- + arch/x86/kernel/sev-shared.c | 2 +- + arch/x86/kernel/sev.c | 183 +--- + arch/x86/kernel/sev_verify_cbit.S | 2 +- + arch/x86/kernel/static_call.c | 5 +- + arch/x86/kernel/verify_cpu.S | 4 +- + arch/x86/kernel/vmlinux.lds.S | 1 - + arch/x86/kernel/x86_init.c | 12 - + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/emulate.c | 16 +- + arch/x86/kvm/mmu/spte.c | 1 + + arch/x86/kvm/pmu.c | 2 +- + arch/x86/kvm/svm/svm.c | 2 +- + arch/x86/kvm/svm/vmenter.S | 4 +- + arch/x86/kvm/vmx/vmenter.S | 14 +- + arch/x86/kvm/vmx/vmx.c | 25 +- + arch/x86/kvm/vmx/vmx_ops.h | 16 +- + arch/x86/kvm/x86.c | 58 +- + arch/x86/kvm/x86.h | 17 +- + arch/x86/lib/Makefile | 1 - + arch/x86/lib/atomic64_386_32.S | 86 +- + arch/x86/lib/atomic64_cx8_32.S | 16 +- + arch/x86/lib/checksum_32.S | 27 +- + arch/x86/lib/clear_page_64.S | 6 +- + arch/x86/lib/cmpxchg16b_emu.S | 4 +- + arch/x86/lib/cmpxchg8b_emu.S | 4 +- + arch/x86/lib/copy_mc_64.S | 18 +- + arch/x86/lib/copy_page_64.S | 4 +- + arch/x86/lib/copy_user_64.S | 55 +- + arch/x86/lib/csum-copy_64.S | 2 +- + arch/x86/lib/csum-partial_64.c | 183 ++-- + arch/x86/lib/error-inject.c | 3 +- + arch/x86/lib/getuser.S | 22 +- + arch/x86/lib/hweight.S | 6 +- + arch/x86/lib/insn-eval.c | 175 +++- + arch/x86/lib/iomap_copy_64.S | 2 +- + arch/x86/lib/memcpy_32.c | 4 - + arch/x86/lib/memcpy_64.S | 12 +- + arch/x86/lib/memmove_64.S | 4 +- + arch/x86/lib/memset_64.S | 6 +- + arch/x86/lib/mmx_32.c | 388 --------- + arch/x86/lib/msr-reg.S | 4 +- + arch/x86/lib/putuser.S | 6 +- + arch/x86/lib/retpoline.S | 4 +- + arch/x86/lib/usercopy_32.c | 67 +- + arch/x86/lib/usercopy_64.c | 8 +- + arch/x86/math-emu/div_Xsig.S | 2 +- + arch/x86/math-emu/div_small.S | 2 +- + arch/x86/math-emu/mul_Xsig.S | 6 +- + arch/x86/math-emu/polynom_Xsig.S | 2 +- + arch/x86/math-emu/reg_norm.S | 6 +- + arch/x86/math-emu/reg_round.S | 2 +- + arch/x86/math-emu/reg_u_add.S | 2 +- + arch/x86/math-emu/reg_u_div.S | 2 +- + arch/x86/math-emu/reg_u_mul.S | 2 +- + arch/x86/math-emu/reg_u_sub.S | 2 +- + arch/x86/math-emu/round_Xsig.S | 4 +- + arch/x86/math-emu/shr_Xsig.S | 8 +- + arch/x86/math-emu/wm_shrx.S | 16 +- + arch/x86/mm/Makefile | 7 +- + arch/x86/mm/extable.c | 124 ++- + arch/x86/mm/init.c | 5 + + arch/x86/mm/mem_encrypt.c | 441 +--------- + arch/x86/mm/mem_encrypt_amd.c | 438 ++++++++++ + arch/x86/mm/mem_encrypt_boot.S | 4 +- + arch/x86/mm/tlb.c | 10 +- + arch/x86/net/bpf_jit_comp.c | 2 +- + arch/x86/pci/xen.c | 38 +- + arch/x86/platform/ce4100/falconfalls.dts | 4 +- + arch/x86/platform/efi/efi_stub_32.S | 2 +- + arch/x86/platform/efi/efi_stub_64.S | 2 +- + arch/x86/platform/efi/efi_thunk_64.S | 2 +- + arch/x86/platform/olpc/xo1-wakeup.S | 6 +- + arch/x86/power/hibernate_asm_32.S | 4 +- + arch/x86/power/hibernate_asm_64.S | 4 +- + arch/x86/purgatory/Makefile | 2 +- + arch/x86/realmode/init.c | 26 + + arch/x86/um/checksum_32.S | 4 +- + arch/x86/um/setjmp_32.S | 2 +- + arch/x86/um/setjmp_64.S | 2 +- + arch/x86/xen/Kconfig | 1 + + arch/x86/xen/pmu.c | 32 +- + arch/x86/xen/xen-asm.S | 12 +- + arch/x86/xen/xen-head.S | 2 +- + arch/xtensa/Kconfig | 1 - + arch/xtensa/include/asm/futex.h | 8 +- + arch/xtensa/include/asm/spinlock_types.h | 2 +- + drivers/acpi/apei/einj.c | 3 +- + drivers/acpi/apei/ghes.c | 2 +- + drivers/base/core.c | 4 - + drivers/base/node.c | 3 + + drivers/base/platform-msi.c | 234 ++--- + drivers/bus/fsl-mc/dprc-driver.c | 8 +- + drivers/bus/fsl-mc/fsl-mc-allocator.c | 9 +- + drivers/bus/fsl-mc/fsl-mc-msi.c | 79 +- + drivers/dma/mv_xor_v2.c | 16 +- + drivers/dma/qcom/hidma.c | 44 +- + drivers/dma/ti/k3-udma-private.c | 6 +- + drivers/dma/ti/k3-udma.c | 14 +- + drivers/edac/amd64_edac.c | 275 ++++++ + drivers/edac/mce_amd.c | 146 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +- + drivers/infiniband/hw/irdma/hw.c | 4 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 23 +- + drivers/irqchip/irq-gic-v2m.c | 1 - + drivers/irqchip/irq-gic-v3-its-pci-msi.c | 1 - + drivers/irqchip/irq-gic-v3-mbi.c | 1 - + drivers/irqchip/irq-mbigen.c | 4 +- + drivers/irqchip/irq-mvebu-icu.c | 12 +- + drivers/irqchip/irq-ti-sci-inta.c | 2 +- + drivers/mailbox/bcm-flexrm-mailbox.c | 13 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 8 +- + drivers/net/ethernet/emulex/benet/be_main.c | 4 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 4 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 5 +- + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 8 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 8 +- + drivers/net/wireless/ath/ath11k/pci.c | 2 +- + drivers/ntb/msi.c | 19 +- + drivers/pci/Makefile | 3 +- + drivers/pci/controller/pci-hyperv.c | 15 +- + drivers/pci/msi/Makefile | 7 + + drivers/pci/msi/irqdomain.c | 280 ++++++ + drivers/pci/msi/legacy.c | 81 ++ + drivers/pci/{ => msi}/msi.c | 954 ++++++--------------- + drivers/pci/msi/msi.h | 39 + + drivers/pci/msi/pcidev_msi.c | 43 + + drivers/pci/pci-sysfs.c | 7 +- + drivers/pci/pci.c | 5 - + drivers/pci/probe.c | 4 +- + drivers/pci/xen-pcifront.c | 4 +- + drivers/perf/arm_smmuv3_pmu.c | 5 +- + drivers/scsi/lpfc/lpfc_init.c | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 27 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 21 +- + drivers/soc/fsl/dpio/dpio-driver.c | 8 +- + drivers/soc/ti/k3-ringacc.c | 6 +- + drivers/soc/ti/ti_sci_inta_msi.c | 94 +- + drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 4 +- + include/asm-generic/futex.h | 31 +- + include/kvm/arm_pmu.h | 19 +- + include/linux/bitfield.h | 19 +- + include/linux/cc_platform.h | 11 + + include/linux/device.h | 31 +- + include/linux/entry-kvm.h | 2 +- + include/linux/fsl/mc.h | 4 +- + include/linux/interrupt.h | 53 +- + include/linux/irqdomain.h | 2 +- + include/linux/irqflags.h | 23 +- + include/linux/kvm_host.h | 10 + + include/linux/mm.h | 13 + + include/linux/msi.h | 289 ++++--- + include/linux/numa.h | 4 + + include/linux/pci.h | 6 +- + include/linux/perf_event.h | 44 +- + include/linux/psi.h | 1 + + include/linux/psi_types.h | 14 +- + include/linux/ratelimit_types.h | 2 +- + include/linux/rtmutex.h | 9 + + include/linux/sched.h | 13 + + include/linux/soc/ti/ti_sci_inta_msi.h | 2 - + include/linux/spinlock_types_up.h | 2 +- + include/linux/thread_info.h | 14 + + init/Kconfig | 13 +- + kernel/entry/common.c | 4 +- + kernel/entry/kvm.c | 4 +- + kernel/events/core.c | 41 +- + kernel/futex/core.c | 35 - + kernel/futex/futex.h | 6 - + kernel/futex/syscalls.c | 22 - + kernel/irq/generic-chip.c | 2 +- + kernel/irq/manage.c | 8 +- + kernel/irq/msi.c | 793 ++++++++++++----- + kernel/locking/lockdep.c | 2 + + kernel/locking/mutex.c | 11 +- + kernel/locking/rtmutex.c | 10 +- + kernel/locking/rtmutex_api.c | 30 +- + kernel/locking/rwsem.c | 9 - + kernel/locking/spinlock_rt.c | 6 - + kernel/locking/ww_rt_mutex.c | 2 +- + kernel/notifier.c | 15 +- + kernel/sched/core.c | 89 +- + kernel/sched/core_sched.c | 66 +- + kernel/sched/cpuacct.c | 107 ++- + kernel/sched/cpufreq_schedutil.c | 2 +- + kernel/sched/cputime.c | 4 +- + kernel/sched/debug.c | 4 + + kernel/sched/fair.c | 87 +- + kernel/sched/psi.c | 47 +- + kernel/sched/rt.c | 23 +- + kernel/sched/sched.h | 76 +- + kernel/sched/stats.h | 5 +- + lib/atomic64.c | 2 - + lib/locking-selftest.c | 172 ++-- + mm/memory-failure.c | 19 +- + samples/ftrace/ftrace-direct-modify.c | 4 +- + samples/ftrace/ftrace-direct-too.c | 2 +- + samples/ftrace/ftrace-direct.c | 2 +- + scripts/Makefile.build | 3 +- + scripts/link-vmlinux.sh | 3 + + tools/arch/x86/include/asm/required-features.h | 4 - + tools/objtool/arch/x86/decode.c | 13 +- + tools/objtool/builtin-check.c | 3 +- + tools/objtool/check.c | 22 +- + tools/objtool/include/objtool/arch.h | 1 + + tools/objtool/include/objtool/builtin.h | 2 +- + tools/testing/selftests/sgx/Makefile | 2 +- + tools/testing/selftests/sgx/defines.h | 33 +- + tools/testing/selftests/sgx/load.c | 40 +- + tools/testing/selftests/sgx/main.c | 356 +++++++- + tools/testing/selftests/sgx/main.h | 6 +- + tools/testing/selftests/sgx/sigstruct.c | 12 +- + tools/testing/selftests/sgx/test_encl.c | 60 +- + tools/testing/selftests/sgx/test_encl_bootstrap.S | 21 +- + virt/kvm/kvm_main.c | 44 + + 424 files changed, 5974 insertions(+), 5390 deletions(-) + delete mode 100644 arch/arm64/kvm/perf.c + delete mode 100644 arch/powerpc/platforms/4xx/msi.c + create mode 100644 arch/x86/mm/mem_encrypt_amd.c + create mode 100644 drivers/pci/msi/Makefile + create mode 100644 drivers/pci/msi/irqdomain.c + create mode 100644 drivers/pci/msi/legacy.c + rename drivers/pci/{ => msi}/msi.c (56%) + create mode 100644 drivers/pci/msi/msi.h + create mode 100644 drivers/pci/msi/pcidev_msi.c +Merging clockevents/timers/drivers/next (7647204c2e81 dt-bindings: timer: Add Mstar MSC313e timer devicetree bindings documentation) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/cdns,ttc.yaml | 3 + + .../bindings/timer/mstar,msc313e-timer.yaml | 46 ++++ + .../devicetree/bindings/timer/nxp,tpm-timer.yaml | 6 +- + .../devicetree/bindings/timer/renesas,ostm.yaml | 20 +- + .../bindings/timer/rockchip,rk-timer.yaml | 1 - + MAINTAINERS | 1 + + drivers/clocksource/Kconfig | 12 +- + drivers/clocksource/Makefile | 1 + + drivers/clocksource/exynos_mct.c | 52 +++-- + drivers/clocksource/renesas-ostm.c | 39 +++- + drivers/clocksource/timer-imx-sysctr.c | 6 +- + drivers/clocksource/timer-msc313e.c | 253 +++++++++++++++++++++ + drivers/clocksource/timer-pistachio.c | 3 +- + 13 files changed, 411 insertions(+), 32 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/mstar,msc313e-timer.yaml + create mode 100644 drivers/clocksource/timer-msc313e.c +Merging edac/edac-for-next (3a8cccd0b519 Merge branch 'edac-amd64' into edac-for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging drivers/edac/amd64_edac.c +Merge made by the 'recursive' strategy. + .../memory-controllers/synopsys,ddrc-ecc.yaml | 1 + + drivers/edac/Kconfig | 2 +- + drivers/edac/amd64_edac.c | 36 ++++++++++++++- + drivers/edac/amd64_edac.h | 8 +++- + drivers/edac/edac_mc.c | 2 + + drivers/edac/sb_edac.c | 2 +- + drivers/edac/sifive_edac.c | 2 +- + drivers/edac/synopsys_edac.c | 52 ++++++++++++++++++---- + drivers/ras/cec.c | 2 +- + include/linux/edac.h | 6 +++ + 10 files changed, 98 insertions(+), 15 deletions(-) +Merging irqchip/irq/irqchip-next (cd448b24c621 Merge branch irq/misc-5.17 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/irqchip/irq-gic-v2m.c +Merge made by the 'recursive' strategy. + drivers/irqchip/irq-gic-v2m.c | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 82 ++++++++++++++++++++++++++++--- + drivers/irqchip/irq-gic-v3.c | 17 +++++++ + drivers/irqchip/irq-imx-gpcv2.c | 2 +- + drivers/irqchip/irq-ingenic-tcu.c | 4 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 9 ++-- + drivers/irqchip/irq-renesas-irqc.c | 9 ++-- + drivers/irqchip/spear-shirq.c | 2 + + include/linux/irqchip/arm-gic-v3.h | 4 +- + 9 files changed, 112 insertions(+), 19 deletions(-) +Merging ftrace/for-next (a6ed2aee5464 tracing: Switch to kvfree_rcu() API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Auto-merging tools/perf/util/scripting-engines/trace-event-python.c +Auto-merging tools/perf/util/python.c +Auto-merging tools/perf/util/evsel.c +Auto-merging tools/perf/builtin-trace.c +Auto-merging kernel/trace/trace_uprobe.c +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace_events_synth.c +Merge made by the 'recursive' strategy. + include/linux/trace_events.h | 1 + + include/trace/bpf_probe.h | 16 +++ + include/trace/perf.h | 16 +++ + include/trace/trace_events.h | 120 ++++++++++++++++++++- + kernel/trace/trace.c | 61 ++++++----- + kernel/trace/trace.h | 8 +- + kernel/trace/trace_eprobe.c | 16 +-- + kernel/trace/trace_events_filter.c | 32 +++++- + kernel/trace/trace_events_hist.c | 21 +++- + kernel/trace/trace_events_inject.c | 11 +- + kernel/trace/trace_events_synth.c | 2 +- + kernel/trace/trace_kprobe.c | 25 ++--- + kernel/trace/trace_osnoise.c | 3 +- + kernel/trace/trace_probe.c | 3 +- + kernel/trace/trace_uprobe.c | 11 +- + samples/trace_events/trace-events-sample.c | 3 + + samples/trace_events/trace-events-sample.h | 33 ++++++ + tools/lib/traceevent/event-parse.c | 59 ++++++---- + tools/lib/traceevent/event-parse.h | 5 +- + tools/lib/traceevent/parse-filter.c | 5 +- + tools/perf/builtin-trace.c | 2 + + tools/perf/util/data-convert-bt.c | 2 + + tools/perf/util/evsel.c | 2 + + tools/perf/util/python.c | 2 + + .../perf/util/scripting-engines/trace-event-perl.c | 2 + + .../util/scripting-engines/trace-event-python.c | 2 + + tools/perf/util/sort.c | 2 + + 27 files changed, 366 insertions(+), 99 deletions(-) +Merging rcu/rcu/next (4dabd7096bfe rcu: Mark writes to the rcu_segcblist structure's ->flags field) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging tools/objtool/check.c +Auto-merging kernel/kcsan/Makefile +Auto-merging include/linux/sched.h +Auto-merging include/asm-generic/barrier.h +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../RCU/Design/Expedited-Grace-Periods/Funnel0.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel1.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel2.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel3.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel4.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel5.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel6.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel7.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel8.svg | 4 +- + .../Design/Requirements/GPpartitionReaders1.svg | 36 +- + .../Design/Requirements/ReadersPartitionGP1.svg | 62 +-- + Documentation/RCU/stallwarn.rst | 11 - + Documentation/RCU/whatisRCU.rst | 90 +++- + Documentation/admin-guide/kernel-parameters.txt | 74 +++- + .../admin-guide/kernel-per-CPU-kthreads.rst | 2 +- + Documentation/dev-tools/kcsan.rst | 76 +++- + .../litmus-tests/locking/DCL-broken.litmus | 55 +++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 +++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + Documentation/timers/no_hz.rst | 10 +- + MAINTAINERS | 2 + + arch/x86/include/asm/barrier.h | 10 +- + arch/x86/include/asm/qspinlock.h | 1 + + include/asm-generic/barrier.h | 54 ++- + include/asm-generic/bitops/instrumented-atomic.h | 3 + + include/asm-generic/bitops/instrumented-lock.h | 3 + + include/linux/atomic/atomic-instrumented.h | 135 +++++- + include/linux/compiler_attributes.h | 18 + + include/linux/compiler_types.h | 13 +- + include/linux/kcsan-checks.h | 83 +++- + include/linux/kcsan.h | 11 +- + include/linux/rcu_segcblist.h | 51 ++- + include/linux/rcupdate.h | 52 ++- + include/linux/rcutiny.h | 2 +- + include/linux/sched.h | 3 + + include/linux/spinlock.h | 2 +- + include/linux/srcu.h | 3 +- + include/linux/torture.h | 9 +- + include/trace/events/rcu.h | 9 +- + init/init_task.c | 5 - + kernel/kcsan/Makefile | 2 + + kernel/kcsan/core.c | 347 ++++++++++++--- + kernel/kcsan/kcsan_test.c | 426 ++++++++++++++++-- + kernel/kcsan/report.c | 51 ++- + kernel/kcsan/selftest.c | 143 ++++++ + kernel/locking/locktorture.c | 4 +- + kernel/rcu/Kconfig | 20 +- + kernel/rcu/rcu_segcblist.c | 10 +- + kernel/rcu/rcu_segcblist.h | 16 +- + kernel/rcu/rcuscale.c | 14 +- + kernel/rcu/rcutorture.c | 267 +++++++++--- + kernel/rcu/refscale.c | 50 +-- + kernel/rcu/srcutiny.c | 2 +- + kernel/rcu/tasks.h | 481 +++++++++++++++++---- + kernel/rcu/tree.c | 413 +++++++++++------- + kernel/rcu/tree.h | 48 +- + kernel/rcu/tree_exp.h | 19 +- + kernel/rcu/tree_nocb.h | 167 ++++--- + kernel/rcu/tree_plugin.h | 268 ++---------- + kernel/rcu/tree_stall.h | 27 +- + kernel/scftorture.c | 16 +- + kernel/sched/Makefile | 7 +- + kernel/time/Kconfig | 9 + + kernel/time/clocksource.c | 58 ++- + kernel/torture.c | 10 +- + kernel/workqueue.c | 22 +- + lib/Kconfig.kcsan | 20 + + mm/Makefile | 2 + + scripts/Makefile.kcsan | 15 +- + scripts/Makefile.lib | 5 + + scripts/atomic/gen-atomic-instrumented.sh | 41 +- + tools/include/nolibc/nolibc.h | 86 ++-- + tools/memory-model/Documentation/explanation.txt | 44 +- + tools/memory-model/Documentation/locking.txt | 320 ++++++++++++++ + tools/memory-model/README | 12 + + tools/memory-model/linux-kernel.cat | 6 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + .../LB+unlocklockonceonce+poacquireonce.litmus | 35 ++ + .../MP+unlocklockonceonce+fencermbonceonce.litmus | 33 ++ + tools/memory-model/litmus-tests/README | 8 + + 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/objtool/check.c | 41 +- + tools/objtool/include/objtool/elf.h | 2 +- + .../selftests/rcutorture/bin/console-badness.sh | 2 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 4 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 34 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 11 +- + .../selftests/rcutorture/bin/parse-build.sh | 3 +- + .../selftests/rcutorture/bin/parse-console.sh | 10 + + tools/testing/selftests/rcutorture/bin/torture.sh | 30 +- + .../selftests/rcutorture/configs/rcu/SRCU-T | 1 + + .../selftests/rcutorture/configs/rcu/SRCU-U | 1 + + .../selftests/rcutorture/configs/rcu/TASKS01.boot | 1 + + .../selftests/rcutorture/configs/rcu/TINY01 | 1 + + .../selftests/rcutorture/configs/rcu/TINY02 | 1 + + .../selftests/rcutorture/configs/rcu/TRACE01.boot | 1 + + .../selftests/rcutorture/configs/rcu/TRACE02.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE01 | 1 - + .../selftests/rcutorture/configs/rcu/TREE02 | 1 - + .../selftests/rcutorture/configs/rcu/TREE02.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE04 | 1 - + .../selftests/rcutorture/configs/rcu/TREE05 | 1 - + .../selftests/rcutorture/configs/rcu/TREE06 | 1 - + .../selftests/rcutorture/configs/rcu/TREE07 | 1 - + .../selftests/rcutorture/configs/rcu/TREE08 | 1 - + .../selftests/rcutorture/configs/rcu/TREE10 | 1 - + .../selftests/rcutorture/configs/rcu/TREE10.boot | 1 + + .../selftests/rcutorture/configs/rcuscale/TINY | 2 +- + .../selftests/rcutorture/configs/rcuscale/TRACE01 | 1 - + .../selftests/rcutorture/configs/rcuscale/TREE | 1 - + .../selftests/rcutorture/configs/rcuscale/TREE54 | 1 - + .../rcutorture/configs/refscale/NOPREEMPT | 1 - + .../selftests/rcutorture/configs/refscale/PREEMPT | 1 - + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 1 - + 130 files changed, 3970 insertions(+), 1267 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100644 tools/memory-model/litmus-tests/LB+unlocklockonceonce+poacquireonce.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+unlocklockonceonce+fencermbonceonce.litmus + 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/TREE02.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE10.boot +Merging kvm/next (5e4e84f1124a Merge tag 'kvm-s390-next-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging virt/kvm/kvm_main.c +Auto-merging include/linux/kvm_host.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/mmu/spte.c +Auto-merging arch/x86/kvm/Kconfig +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/powerpc/kvm/Kconfig +Auto-merging arch/arm64/kvm/reset.c +Auto-merging arch/arm64/kvm/pmu-emul.c +Auto-merging arch/arm64/kvm/handle_exit.c +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/Makefile +CONFLICT (content): Merge conflict in arch/arm64/kvm/Makefile +Auto-merging arch/arm64/kvm/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/kvm/Kconfig +Auto-merging arch/arm64/include/asm/kvm_host.h +Resolved 'arch/arm64/kvm/Kconfig' using previous resolution. +Resolved 'arch/arm64/kvm/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bea145044a2d] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 6 +- + Documentation/virt/kvm/mmu.rst | 8 +- + arch/arm64/include/asm/kvm_emulate.h | 2 + + arch/arm64/include/asm/kvm_host.h | 1 - + arch/arm64/kvm/Kconfig | 1 + + arch/arm64/kvm/Makefile | 6 +- + arch/arm64/kvm/arch_timer.c | 13 +- + arch/arm64/kvm/arm.c | 70 ++- + arch/arm64/kvm/handle_exit.c | 5 +- + arch/arm64/kvm/mmu.c | 27 +- + arch/arm64/kvm/pmu-emul.c | 2 +- + arch/arm64/kvm/psci.c | 8 +- + arch/arm64/kvm/reset.c | 2 +- + arch/arm64/kvm/vgic/vgic-init.c | 10 +- + arch/arm64/kvm/vgic/vgic-kvm-device.c | 2 +- + arch/arm64/kvm/vgic/vgic-mmio-v2.c | 3 +- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 7 +- + arch/arm64/kvm/vgic/vgic-v3.c | 4 +- + arch/arm64/kvm/vgic/vgic-v4.c | 5 +- + arch/arm64/kvm/vgic/vgic.c | 2 +- + arch/mips/include/asm/kvm_host.h | 1 - + arch/mips/kvm/Kconfig | 1 + + arch/mips/kvm/Makefile | 3 +- + arch/mips/kvm/emulate.c | 2 +- + arch/mips/kvm/loongson_ipi.c | 4 +- + arch/mips/kvm/mips.c | 32 +- + arch/powerpc/include/asm/kvm_host.h | 2 +- + arch/powerpc/include/asm/kvm_ppc.h | 14 +- + arch/powerpc/kvm/Kconfig | 1 + + arch/powerpc/kvm/Makefile | 8 +- + arch/powerpc/kvm/book3s.c | 14 +- + arch/powerpc/kvm/book3s_32_mmu.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 4 +- + arch/powerpc/kvm/book3s_hv.c | 36 +- + arch/powerpc/kvm/book3s_hv_nested.c | 4 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 14 +- + arch/powerpc/kvm/book3s_pr.c | 13 +- + arch/powerpc/kvm/book3s_pr_papr.c | 2 +- + arch/powerpc/kvm/book3s_xics.c | 6 +- + arch/powerpc/kvm/book3s_xics.h | 2 +- + arch/powerpc/kvm/book3s_xive.c | 15 +- + arch/powerpc/kvm/book3s_xive.h | 4 +- + arch/powerpc/kvm/book3s_xive_native.c | 8 +- + arch/powerpc/kvm/booke.c | 9 +- + arch/powerpc/kvm/e500_emulate.c | 2 +- + arch/powerpc/kvm/powerpc.c | 24 +- + arch/riscv/include/asm/kvm_host.h | 1 - + arch/riscv/kvm/Makefile | 6 +- + arch/riscv/kvm/mmu.c | 31 +- + arch/riscv/kvm/vcpu_exit.c | 2 +- + arch/riscv/kvm/vcpu_sbi.c | 2 +- + arch/riscv/kvm/vm.c | 10 +- + arch/riscv/kvm/vmid.c | 2 +- + arch/s390/include/asm/kvm_host.h | 2 - + arch/s390/include/asm/uv.h | 34 +- + arch/s390/kvm/Kconfig | 1 + + arch/s390/kvm/Makefile | 8 +- + arch/s390/kvm/gaccess.c | 158 ++--- + arch/s390/kvm/interrupt.c | 12 +- + arch/s390/kvm/kvm-s390.c | 161 ++--- + arch/s390/kvm/kvm-s390.h | 19 +- + arch/s390/kvm/pv.c | 4 +- + arch/s390/kvm/sigp.c | 28 + + arch/x86/include/asm/kvm_host.h | 59 +- + arch/x86/include/asm/kvm_page_track.h | 6 +- + arch/x86/kvm/Kconfig | 2 + + arch/x86/kvm/Makefile | 7 +- + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/debugfs.c | 6 +- + arch/x86/kvm/hyperv.c | 9 +- + arch/x86/kvm/i8254.c | 2 +- + arch/x86/kvm/i8259.c | 5 +- + arch/x86/kvm/ioapic.c | 4 +- + arch/x86/kvm/irq_comm.c | 7 +- + arch/x86/kvm/kvm_cache_regs.h | 20 +- + arch/x86/kvm/kvm_onhyperv.c | 3 +- + arch/x86/kvm/lapic.c | 63 +- + arch/x86/kvm/mmu.h | 16 +- + arch/x86/kvm/mmu/mmu.c | 151 ++--- + arch/x86/kvm/mmu/mmu_internal.h | 9 +- + arch/x86/kvm/mmu/mmutrace.h | 2 +- + arch/x86/kvm/mmu/page_track.c | 8 +- + arch/x86/kvm/mmu/paging_tmpl.h | 48 +- + arch/x86/kvm/mmu/spte.c | 6 +- + arch/x86/kvm/mmu/spte.h | 2 +- + arch/x86/kvm/mmu/tdp_mmu.c | 2 +- + arch/x86/kvm/svm/avic.c | 16 +- + arch/x86/kvm/svm/nested.c | 262 ++++++--- + arch/x86/kvm/svm/pmu.c | 4 + + arch/x86/kvm/svm/sev.c | 9 +- + arch/x86/kvm/svm/svm.c | 47 +- + arch/x86/kvm/svm/svm.h | 71 ++- + arch/x86/kvm/trace.h | 24 + + arch/x86/kvm/vmx/capabilities.h | 9 + + arch/x86/kvm/vmx/nested.c | 55 +- + arch/x86/kvm/vmx/posted_intr.c | 159 ++--- + arch/x86/kvm/vmx/posted_intr.h | 6 +- + arch/x86/kvm/vmx/vmx.c | 136 +++-- + arch/x86/kvm/vmx/vmx.h | 37 +- + arch/x86/kvm/x86.c | 281 +++++---- + include/linux/kvm_dirty_ring.h | 8 +- + include/linux/kvm_host.h | 321 +++++++--- + include/linux/kvm_types.h | 1 + + virt/kvm/Kconfig | 3 + + virt/kvm/Makefile.kvm | 13 + + virt/kvm/async_pf.c | 2 +- + virt/kvm/kvm_main.c | 1047 +++++++++++++++++++-------------- + 108 files changed, 2223 insertions(+), 1621 deletions(-) + create mode 100644 virt/kvm/Makefile.kvm +Merging kvm-arm/next (1c53a1ae3612 Merge branch kvm-arm64/misc-5.17 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c +Auto-merging tools/testing/selftests/kvm/include/kvm_util.h +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging tools/testing/selftests/kvm/.gitignore +Auto-merging include/linux/kvm_host.h +Auto-merging arch/arm64/kvm/vgic/vgic-v3.c +Auto-merging arch/arm64/kvm/vgic/vgic-mmio-v3.c +Auto-merging arch/arm64/kvm/vgic/vgic-init.c +Auto-merging arch/arm64/kvm/reset.c +Auto-merging arch/arm64/kvm/psci.c +Auto-merging arch/arm64/kvm/pmu-emul.c +Auto-merging arch/arm64/kvm/mmu.c +Auto-merging arch/arm64/kvm/hyp/vhe/switch.c +Auto-merging arch/arm64/kvm/hyp/nvhe/switch.c +Auto-merging arch/arm64/kvm/hyp/include/hyp/switch.h +Auto-merging arch/arm64/kvm/arm.c +CONFLICT (content): Merge conflict in arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/Makefile +Auto-merging arch/arm64/kernel/fpsimd.c +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/kvm_emulate.h +Resolved 'arch/arm64/kvm/arm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 95952fda1c29] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git +$ git diff -M --stat --summary HEAD^.. + arch/arm64/include/asm/kvm_asm.h | 1 + + arch/arm64/include/asm/kvm_emulate.h | 2 +- + arch/arm64/include/asm/kvm_host.h | 46 +- + arch/arm64/include/asm/kvm_hyp.h | 1 - + arch/arm64/include/asm/kvm_mmu.h | 2 + + arch/arm64/include/asm/kvm_pgtable.h | 30 +- + arch/arm64/include/asm/kvm_pkvm.h | 71 ++ + arch/arm64/include/asm/mmu.h | 1 + + arch/arm64/include/asm/sysreg.h | 1 + + arch/arm64/kernel/asm-offsets.c | 1 - + arch/arm64/kernel/fpsimd.c | 6 +- + arch/arm64/kvm/.gitignore | 2 + + arch/arm64/kvm/Makefile | 18 +- + arch/arm64/kvm/arm.c | 64 +- + arch/arm64/kvm/fpsimd.c | 79 +- + arch/arm64/kvm/hyp/Makefile | 2 +- + arch/arm64/kvm/hyp/fpsimd.S | 6 - + arch/arm64/kvm/hyp/hyp-constants.c | 10 + + arch/arm64/kvm/hyp/include/hyp/switch.h | 30 +- + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 6 + + arch/arm64/kvm/hyp/include/nvhe/mm.h | 59 -- + arch/arm64/kvm/hyp/nvhe/early_alloc.c | 5 + + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 8 + + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 505 ++++++++++-- + arch/arm64/kvm/hyp/nvhe/mm.c | 4 +- + arch/arm64/kvm/hyp/nvhe/page_alloc.c | 2 +- + arch/arm64/kvm/hyp/nvhe/setup.c | 25 +- + arch/arm64/kvm/hyp/nvhe/switch.c | 1 - + arch/arm64/kvm/hyp/pgtable.c | 108 ++- + arch/arm64/kvm/hyp/vhe/switch.c | 1 - + arch/arm64/kvm/mmu.c | 150 +++- + arch/arm64/kvm/{hyp/reserved_mem.c => pkvm.c} | 8 +- + arch/arm64/kvm/pmu-emul.c | 1 + + arch/arm64/kvm/psci.c | 2 +- + arch/arm64/kvm/reset.c | 28 +- + arch/arm64/kvm/vgic/vgic-init.c | 2 +- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 8 +- + arch/arm64/kvm/vgic/vgic-mmio.c | 2 +- + arch/arm64/kvm/vgic/vgic-mmio.h | 2 +- + arch/arm64/kvm/vgic/vgic-v2.c | 9 +- + arch/arm64/kvm/vgic/vgic-v3.c | 6 +- + include/kvm/arm_vgic.h | 4 +- + include/linux/kvm_host.h | 1 - + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/aarch64/arch_timer.c | 2 +- + tools/testing/selftests/kvm/aarch64/get-reg-list.c | 50 ++ + tools/testing/selftests/kvm/aarch64/vgic_irq.c | 853 +++++++++++++++++++++ + tools/testing/selftests/kvm/include/aarch64/gic.h | 26 + + .../kvm/{lib => include}/aarch64/gic_v3.h | 12 + + .../selftests/kvm/include/aarch64/processor.h | 3 + + tools/testing/selftests/kvm/include/aarch64/vgic.h | 18 +- + tools/testing/selftests/kvm/include/kvm_util.h | 20 +- + tools/testing/selftests/kvm/lib/aarch64/gic.c | 66 ++ + .../selftests/kvm/lib/aarch64/gic_private.h | 11 + + tools/testing/selftests/kvm/lib/aarch64/gic_v3.c | 206 ++++- + .../testing/selftests/kvm/lib/aarch64/processor.c | 82 +- + tools/testing/selftests/kvm/lib/aarch64/vgic.c | 103 ++- + tools/testing/selftests/kvm/lib/guest_modes.c | 49 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 94 +++ + 60 files changed, 2532 insertions(+), 385 deletions(-) + create mode 100644 arch/arm64/include/asm/kvm_pkvm.h + create mode 100644 arch/arm64/kvm/.gitignore + create mode 100644 arch/arm64/kvm/hyp/hyp-constants.c + rename arch/arm64/kvm/{hyp/reserved_mem.c => pkvm.c} (94%) + create mode 100644 tools/testing/selftests/kvm/aarch64/vgic_irq.c + rename tools/testing/selftests/kvm/{lib => include}/aarch64/gic_v3.h (80%) +Merging kvms390/next (812de04661c4 KVM: s390: Clarify SIGP orders versus STOP/RESTART) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging xen-tip/linux-next (bc3bfd76d55f xen/gntdev: fix unmap notification order) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/gntdev.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (7f224759dbdf Merge branch 'for-5.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 79 +++++++++++++++++------------------------------------- + 1 file changed, 24 insertions(+), 55 deletions(-) +Merging drivers-x86/for-next (998e7ea8c641 platform/x86: intel-uncore-frequency: use default_groups in kobj_type) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging include/linux/power_supply.h +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Auto-merging drivers/power/supply/power_supply_sysfs.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/amd-pmc.c +Auto-merging drivers/platform/x86/Makefile +Auto-merging drivers/platform/x86/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/ABI/testing/sysfs-class-power +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-firmware-attributes | 32 + + Documentation/ABI/testing/sysfs-class-power | 14 + + MAINTAINERS | 7 + + drivers/leds/Kconfig | 3 + + drivers/leds/Makefile | 3 + + drivers/leds/simple/Kconfig | 11 + + drivers/leds/simple/Makefile | 2 + + drivers/leds/simple/simatic-ipc-leds.c | 202 ++++ + drivers/platform/surface/Kconfig | 7 +- + drivers/platform/surface/aggregator/Kconfig | 1 + + drivers/platform/surface/aggregator/bus.c | 24 +- + drivers/platform/surface/aggregator/bus.h | 3 - + drivers/platform/surface/aggregator/core.c | 3 +- + .../platform/surface/surface_aggregator_registry.c | 32 +- + drivers/platform/x86/Kconfig | 42 + + drivers/platform/x86/Makefile | 5 + + drivers/platform/x86/amd-pmc.c | 160 +++- + drivers/platform/x86/asus-wmi.c | 605 +++++++++++- + drivers/platform/x86/hp_accel.c | 27 +- + drivers/platform/x86/intel/uncore-frequency.c | 3 +- + drivers/platform/x86/lenovo-yogabook-wmi.c | 408 ++++++++ + drivers/platform/x86/pmc_atom.c | 54 +- + drivers/platform/x86/simatic-ipc.c | 176 ++++ + drivers/platform/x86/think-lmi.c | 327 ++++++- + drivers/platform/x86/think-lmi.h | 28 +- + drivers/platform/x86/thinkpad_acpi.c | 1010 +++++++++++--------- + drivers/platform/x86/uv_sysfs.c | 6 +- + drivers/platform/x86/wmi.c | 27 +- + drivers/platform/x86/x86-android-tablets.c | 321 +++++++ + drivers/power/supply/power_supply_sysfs.c | 55 ++ + drivers/watchdog/Kconfig | 11 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/simatic-ipc-wdt.c | 228 +++++ + include/linux/platform_data/x86/asus-wmi.h | 2 + + include/linux/platform_data/x86/simatic-ipc-base.h | 29 + + include/linux/platform_data/x86/simatic-ipc.h | 72 ++ + include/linux/power_supply.h | 16 + + include/linux/surface_aggregator/device.h | 9 + + include/linux/wmi.h | 1 + + tools/power/x86/intel-speed-select/isst-config.c | 4 +- + 40 files changed, 3329 insertions(+), 642 deletions(-) + create mode 100644 drivers/leds/simple/Kconfig + create mode 100644 drivers/leds/simple/Makefile + create mode 100644 drivers/leds/simple/simatic-ipc-leds.c + create mode 100644 drivers/platform/x86/lenovo-yogabook-wmi.c + create mode 100644 drivers/platform/x86/simatic-ipc.c + create mode 100644 drivers/platform/x86/x86-android-tablets.c + create mode 100644 drivers/watchdog/simatic-ipc-wdt.c + create mode 100644 include/linux/platform_data/x86/simatic-ipc-base.h + create mode 100644 include/linux/platform_data/x86/simatic-ipc.h +Merging chrome-platform/for-next (297d34e73d49 platform/chrome: cros_ec_proto: Use ec_command for check_features) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging hsi/for-next (a1ee1c08fcd5 HSI: core: Fix return freed object in hsi_new_client) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/hsi_core.c | 1 + + 1 file changed, 1 insertion(+) +Merging leds/for-next (d949edb503b1 leds: lp55xx: initialise output direction from dts) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Removing drivers/leds/leds-fsg.c +Auto-merging drivers/leds/Makefile +Auto-merging drivers/leds/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-mt6360.yaml | 159 ++++ + arch/arm/boot/dts/omap3-n900.dts | 50 +- + drivers/leds/Kconfig | 7 - + drivers/leds/Makefile | 1 - + drivers/leds/blink/leds-lgm-sso.c | 1 - + drivers/leds/flash/Kconfig | 13 + + drivers/leds/flash/Makefile | 1 + + drivers/leds/flash/leds-ktd2692.c | 2 +- + drivers/leds/flash/leds-mt6360.c | 910 +++++++++++++++++++++ + drivers/leds/led-class.c | 6 +- + drivers/leds/leds-fsg.c | 193 ----- + drivers/leds/leds-lp50xx.c | 1 - + drivers/leds/leds-lp55xx-common.c | 4 +- + drivers/leds/leds-tca6507.c | 7 +- + 14 files changed, 1130 insertions(+), 225 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-mt6360.yaml + create mode 100644 drivers/leds/flash/leds-mt6360.c + delete mode 100644 drivers/leds/leds-fsg.c +Merging ipmi/for-next (42e941eae9c0 ipmi: ssif: replace strlcpy with strscpy) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/char/ipmi/ipmi_ssif.c | 2 +- + drivers/char/ipmi/ipmi_watchdog.c | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging driver-core/driver-core-next (28f0c335dd4a devtmpfs: mount with noexec and nosuid) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging include/uapi/linux/pci_regs.h +Auto-merging fs/dlm/lockspace.c +Auto-merging drivers/soundwire/intel.c +Auto-merging drivers/platform/x86/intel/Kconfig +CONFLICT (content): Merge conflict in drivers/platform/x86/intel/Kconfig +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Removing drivers/mfd/intel_pmt.c +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/infiniband/hw/irdma/main.c +Auto-merging drivers/base/property.c +Auto-merging drivers/base/core.c +Auto-merging MAINTAINERS +Resolved 'drivers/platform/x86/intel/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 139f7477b3f5] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-devices-system-cpu | 15 + + Documentation/admin-guide/cputopology.rst | 25 +- + Documentation/core-api/kobject.rst | 11 +- + Documentation/driver-api/auxiliary_bus.rst | 236 ++---------- + .../translations/zh_CN/core-api/kobject.rst | 7 +- + MAINTAINERS | 12 +- + drivers/base/Kconfig | 11 + + drivers/base/auxiliary.c | 152 +++++++- + drivers/base/bus.c | 4 +- + drivers/base/core.c | 13 +- + drivers/base/devtmpfs.c | 10 +- + drivers/base/platform.c | 9 +- + drivers/base/property.c | 13 +- + drivers/base/test/test_async_driver_probe.c | 14 +- + drivers/base/topology.c | 28 +- + drivers/dma-buf/dma-buf-sysfs-stats.c | 2 +- + drivers/infiniband/hw/irdma/main.c | 4 +- + drivers/infiniband/hw/mlx5/main.c | 8 +- + drivers/mfd/Kconfig | 10 - + drivers/mfd/Makefile | 1 - + drivers/mfd/intel_pmt.c | 261 ------------- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 8 +- + drivers/platform/x86/intel/Kconfig | 11 + + drivers/platform/x86/intel/Makefile | 2 + + drivers/platform/x86/intel/pmt/Kconfig | 4 +- + drivers/platform/x86/intel/pmt/class.c | 21 +- + drivers/platform/x86/intel/pmt/class.h | 5 +- + drivers/platform/x86/intel/pmt/crashlog.c | 47 +-- + drivers/platform/x86/intel/pmt/telemetry.c | 46 +-- + drivers/platform/x86/intel/vsec.c | 408 +++++++++++++++++++++ + drivers/platform/x86/intel/vsec.h | 43 +++ + drivers/soundwire/intel.c | 8 +- + drivers/soundwire/intel_init.c | 2 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 +- + fs/dlm/lockspace.c | 3 +- + fs/gfs2/sys.c | 3 +- + fs/kernfs/dir.c | 118 +++--- + fs/kernfs/file.c | 6 +- + fs/kernfs/inode.c | 22 +- + fs/kernfs/mount.c | 15 +- + fs/kernfs/symlink.c | 5 +- + fs/nilfs2/sysfs.c | 13 +- + include/linux/auxiliary_bus.h | 174 +++++++++ + include/linux/kernfs.h | 6 +- + include/linux/kobject.h | 17 +- + include/linux/topology.h | 25 ++ + include/uapi/linux/pci_regs.h | 4 + + kernel/params.c | 4 +- + lib/kobject.c | 8 +- + lib/kobject_uevent.c | 6 +- + 50 files changed, 1174 insertions(+), 710 deletions(-) + delete mode 100644 drivers/mfd/intel_pmt.c + create mode 100644 drivers/platform/x86/intel/vsec.c + create mode 100644 drivers/platform/x86/intel/vsec.h +Merging usb/usb-next (0f663729bb4a USB: core: Fix bug in resuming hub's handling of wakeup requests) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging include/acpi/acpi_bus.h +Auto-merging drivers/acpi/scan.c +Auto-merging drivers/acpi/bus.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/usb/dwc3-xilinx.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/configfs-usb-gadget-uac1 | 2 +- + Documentation/ABI/testing/configfs-usb-gadget-uac2 | 2 + + Documentation/ABI/testing/sysfs-bus-usb | 9 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 13 + + .../devicetree/bindings/usb/dwc3-xilinx.txt | 56 - + .../devicetree/bindings/usb/dwc3-xilinx.yaml | 131 ++ + .../devicetree/bindings/usb/qcom,dwc3.yaml | 4 + + .../driver-api/usb/writing_usb_driver.rst | 32 +- + Documentation/usb/gadget-testing.rst | 2 +- + MAINTAINERS | 8 + + drivers/acpi/bus.c | 1 + + drivers/acpi/scan.c | 16 + + drivers/thunderbolt/acpi.c | 15 +- + drivers/thunderbolt/icm.c | 7 +- + drivers/thunderbolt/lc.c | 24 + + drivers/thunderbolt/path.c | 42 +- + drivers/thunderbolt/retimer.c | 28 +- + drivers/thunderbolt/switch.c | 493 +++++- + drivers/thunderbolt/tb.c | 91 +- + drivers/thunderbolt/tb.h | 106 +- + drivers/thunderbolt/tb_msgs.h | 47 +- + drivers/thunderbolt/tb_regs.h | 113 +- + drivers/thunderbolt/tmu.c | 337 +++- + drivers/thunderbolt/tunnel.c | 27 +- + drivers/thunderbolt/tunnel.h | 9 +- + drivers/thunderbolt/usb4.c | 52 +- + drivers/thunderbolt/xdomain.c | 16 +- + drivers/usb/cdns3/cdns3-plat.c | 14 +- + drivers/usb/cdns3/cdnsp-gadget.c | 2 +- + drivers/usb/chipidea/core.c | 1 + + drivers/usb/chipidea/otg.c | 5 +- + drivers/usb/core/driver.c | 3 +- + drivers/usb/core/generic.c | 2 +- + drivers/usb/core/hcd.c | 11 +- + drivers/usb/core/hub.c | 37 +- + drivers/usb/core/port.c | 32 + + drivers/usb/core/usb.c | 46 - + drivers/usb/dwc2/core.h | 6 +- + drivers/usb/dwc2/drd.c | 51 +- + drivers/usb/dwc2/gadget.c | 4 +- + drivers/usb/dwc2/platform.c | 63 +- + drivers/usb/dwc3/core.h | 9 + + drivers/usb/dwc3/dwc3-meson-g12a.c | 17 +- + drivers/usb/dwc3/dwc3-qcom.c | 8 +- + drivers/usb/dwc3/gadget.c | 59 +- + drivers/usb/dwc3/host.c | 45 +- + drivers/usb/gadget/composite.c | 39 +- + drivers/usb/gadget/configfs.c | 39 +- + drivers/usb/gadget/function/f_fs.c | 4 +- + drivers/usb/gadget/function/f_midi.c | 48 +- + drivers/usb/gadget/legacy/inode.c | 10 +- + drivers/usb/gadget/udc/aspeed-vhub/dev.c | 19 +- + drivers/usb/gadget/udc/aspeed-vhub/ep0.c | 7 + + drivers/usb/gadget/udc/aspeed-vhub/hub.c | 47 +- + drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 1 + + drivers/usb/gadget/udc/at91_udc.c | 67 +- + drivers/usb/gadget/udc/at91_udc.h | 8 +- + drivers/usb/gadget/udc/bcm63xx_udc.c | 8 +- + drivers/usb/gadget/udc/bdc/bdc_core.c | 1 + + drivers/usb/gadget/udc/mv_udc_core.c | 4 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 2 +- + drivers/usb/gadget/udc/udc-xilinx.c | 56 + + drivers/usb/host/Kconfig | 11 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-brcm.c | 6 +- + drivers/usb/host/fotg210-hcd.c | 11 +- + drivers/usb/host/ohci-omap.c | 2 +- + drivers/usb/host/ohci-s3c2410.c | 10 +- + drivers/usb/host/ohci-spear.c | 2 +- + drivers/usb/host/u132-hcd.c | 1 - + drivers/usb/host/uhci-platform.c | 9 +- + drivers/usb/host/xen-hcd.c | 1609 ++++++++++++++++++++ + drivers/usb/host/xhci-mtk.c | 16 +- + drivers/usb/host/xhci.c | 6 +- + drivers/usb/isp1760/isp1760-if.c | 16 +- + drivers/usb/misc/ehset.c | 58 + + drivers/usb/misc/ftdi-elan.c | 1 + + drivers/usb/musb/am35x.c | 2 + + drivers/usb/musb/da8xx.c | 20 +- + drivers/usb/musb/jz4740.c | 1 + + drivers/usb/musb/mediatek.c | 2 + + drivers/usb/musb/musb_dsps.c | 15 +- + drivers/usb/musb/omap2430.c | 23 +- + drivers/usb/musb/ux500.c | 18 +- + drivers/usb/phy/phy-mv-usb.c | 5 +- + drivers/usb/renesas_usbhs/common.c | 14 +- + drivers/usb/renesas_usbhs/common.h | 1 - + drivers/usb/renesas_usbhs/mod.c | 14 +- + drivers/usb/storage/sierra_ms.c | 2 - + drivers/usb/typec/Makefile | 3 +- + drivers/usb/typec/class.c | 2 - + drivers/usb/typec/class.h | 10 +- + drivers/usb/typec/port-mapper.c | 279 +--- + drivers/usb/typec/ucsi/ucsi.c | 16 +- + drivers/usb/usbip/usbip_event.c | 1 - + include/acpi/acpi_bus.h | 1 + + include/linux/usb.h | 9 - + include/linux/usb/typec.h | 12 - + include/xen/interface/io/usbif.h | 405 +++++ + 99 files changed, 4126 insertions(+), 946 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/usb/dwc3-xilinx.txt + create mode 100644 Documentation/devicetree/bindings/usb/dwc3-xilinx.yaml + create mode 100644 drivers/usb/host/xen-hcd.c + create mode 100644 include/xen/interface/io/usbif.h +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (2585cf9dfaad Linux 5.16-rc5) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) +$ git merge -m Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-next/for-usb-next +Merge made by the 'recursive' strategy. +Merging tty/tty-next (99a507a8ea28 Revert "serdev: BREAK/FRAME/PARITY/OVERRUN notification prototype V2") +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging include/linux/pci_ids.h +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/net/hamradio/mkiss.c +Removing Documentation/driver-api/serial/tty.rst +Merge made by the 'recursive' strategy. + .../bindings/serial/amlogic,meson-uart.yaml | 2 + + .../devicetree/bindings/serial/fsl-lpuart.yaml | 8 +- + .../devicetree/bindings/serial/renesas,sci.yaml | 48 +- + .../devicetree/bindings/serial/renesas,scif.yaml | 15 + + Documentation/driver-api/serial/index.rst | 1 - + Documentation/driver-api/serial/n_gsm.rst | 8 +- + Documentation/driver-api/serial/tty.rst | 328 -------- + Documentation/index.rst | 1 + + Documentation/tty/index.rst | 63 ++ + Documentation/tty/n_tty.rst | 22 + + Documentation/tty/tty_buffer.rst | 46 + + Documentation/tty/tty_driver.rst | 128 +++ + Documentation/tty/tty_internals.rst | 31 + + Documentation/tty/tty_ldisc.rst | 85 ++ + Documentation/tty/tty_port.rst | 70 ++ + Documentation/tty/tty_struct.rst | 81 ++ + arch/alpha/kernel/srmcons.c | 2 +- + arch/arm/include/debug/pl01x.S | 7 - + drivers/accessibility/speakup/spk_ttyio.c | 4 +- + drivers/bluetooth/hci_ldisc.c | 5 +- + drivers/input/serio/serport.c | 5 +- + drivers/net/can/slcan.c | 4 +- + drivers/net/hamradio/6pack.c | 4 +- + drivers/net/hamradio/mkiss.c | 4 +- + drivers/net/ppp/ppp_async.c | 3 +- + drivers/net/ppp/ppp_synctty.c | 3 +- + drivers/net/slip/slip.c | 4 +- + drivers/s390/char/keyboard.h | 4 +- + drivers/tty/goldfish.c | 12 +- + drivers/tty/mips_ejtag_fdc.c | 22 +- + drivers/tty/moxa.c | 4 +- + drivers/tty/mxser.c | 306 +++---- + drivers/tty/n_gsm.c | 11 +- + drivers/tty/n_hdlc.c | 5 +- + drivers/tty/n_tty.c | 692 ++++++++-------- + drivers/tty/serial/8250/8250.h | 12 +- + drivers/tty/serial/8250/8250_alpha.c | 21 + + drivers/tty/serial/8250/8250_bcm7271.c | 23 +- + drivers/tty/serial/8250/8250_core.c | 9 +- + drivers/tty/serial/8250/8250_pci.c | 407 +-------- + drivers/tty/serial/8250/8250_pericom.c | 214 +++++ + drivers/tty/serial/8250/8250_port.c | 65 +- + drivers/tty/serial/8250/Kconfig | 8 + + drivers/tty/serial/8250/Makefile | 3 + + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/altera_jtaguart.c | 11 +- + drivers/tty/serial/altera_uart.c | 9 +- + drivers/tty/serial/amba-pl011.c | 64 +- + drivers/tty/serial/ar933x_uart.c | 12 +- + drivers/tty/serial/atmel_serial.c | 16 +- + drivers/tty/serial/bcm63xx_uart.c | 10 +- + drivers/tty/serial/fsl_lpuart.c | 12 +- + drivers/tty/serial/imx.c | 13 +- + drivers/tty/serial/lantiq.c | 34 +- + drivers/tty/serial/lpc32xx_hs.c | 2 +- + drivers/tty/serial/meson_uart.c | 45 +- + drivers/tty/serial/pmac_zilog.c | 12 +- + drivers/tty/serial/pxa.c | 12 +- + drivers/tty/serial/samsung_tty.c | 78 +- + drivers/tty/serial/serial_core.c | 16 +- + drivers/tty/serial/sh-sci.c | 91 +- + drivers/tty/serial/sunsu.c | 3 +- + drivers/tty/serial/uartlite.c | 2 +- + drivers/tty/serial/vt8500_serial.c | 12 +- + drivers/tty/tty_buffer.c | 279 +++---- + drivers/tty/tty_io.c | 921 ++++++++++----------- + drivers/tty/tty_ldisc.c | 292 +++---- + drivers/tty/tty_ldsem.c | 2 +- + drivers/tty/tty_port.c | 223 +++-- + drivers/tty/vt/keyboard.c | 18 +- + drivers/tty/vt/vt.c | 2 +- + drivers/usb/class/cdc-acm.c | 4 - + include/linux/amba/bus.h | 6 - + include/linux/pci_ids.h | 18 - + include/linux/serial_8250.h | 2 - + include/linux/serial_s3c.h | 9 - + include/linux/tty.h | 153 +++- + include/linux/tty_driver.h | 572 ++++++++----- + include/linux/tty_flip.h | 1 - + include/linux/tty_ldisc.h | 287 ++++--- + include/linux/tty_port.h | 131 ++- + net/nfc/nci/uart.c | 5 +- + 82 files changed, 3233 insertions(+), 2948 deletions(-) + delete mode 100644 Documentation/driver-api/serial/tty.rst + create mode 100644 Documentation/tty/index.rst + create mode 100644 Documentation/tty/n_tty.rst + create mode 100644 Documentation/tty/tty_buffer.rst + create mode 100644 Documentation/tty/tty_driver.rst + create mode 100644 Documentation/tty/tty_internals.rst + create mode 100644 Documentation/tty/tty_ldisc.rst + create mode 100644 Documentation/tty/tty_port.rst + create mode 100644 Documentation/tty/tty_struct.rst + create mode 100644 drivers/tty/serial/8250/8250_alpha.c + create mode 100644 drivers/tty/serial/8250/8250_pericom.c +Merging char-misc/char-misc-next (8f2cade5da97 dt-bindings: mux: Document mux-states property) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging include/linux/property.h +Removing include/linux/platform_data/ad5755.h +Auto-merging drivers/soundwire/qcom.c +Auto-merging drivers/soc/xilinx/zynqmp_power.c +Removing drivers/rapidio/switches/tsi57x.c +Removing drivers/rapidio/switches/tsi568.c +Auto-merging drivers/misc/mei/client.c +Auto-merging drivers/misc/lkdtm/core.c +Auto-merging drivers/misc/lkdtm/Makefile +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging drivers/base/property.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/phy/phy-tegra194-p2u.txt +Removing Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml +Merge made by the 'recursive' strategy. + .../ABI/testing/debugfs-driver-habanalabs | 23 +- + .../ABI/testing/sysfs-bus-iio-filter-admv8818 | 16 + + .../ABI/testing/sysfs-bus-iio-frequency-admv1013 | 38 + + .../devicetree/bindings/iio/adc/fsl,vf610-adc.yaml | 2 +- + .../bindings/iio/adc/x-powers,axp209-adc.yaml | 3 + + .../bindings/iio/adc/xlnx,zynqmp-ams.yaml | 227 +++ + .../bindings/iio/addac/adi,ad74413r.yaml | 158 ++ + .../devicetree/bindings/iio/dac/adi,ad3552r.yaml | 217 ++ + .../devicetree/bindings/iio/dac/adi,ad5755.yaml | 1 - + .../devicetree/bindings/iio/dac/adi,ad7293.yaml | 61 + + .../bindings/iio/filter/adi,admv8818.yaml | 66 + + .../bindings/iio/frequency/adi,admv1013.yaml | 91 + + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 7 + + .../bindings/iio/light/liteon,ltr501.yaml | 7 + + .../bindings/interconnect/qcom,osm-l3.yaml | 1 + + .../bindings/interconnect/qcom,qcm2290.yaml | 137 ++ + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 143 +- + .../bindings/interconnect/qcom,rpmh.yaml | 11 + + .../bindings/interconnect/qcom,sdm660.yaml | 185 -- + .../devicetree/bindings/mux/gpio-mux.yaml | 11 +- + .../devicetree/bindings/mux/mux-consumer.yaml | 21 + + .../devicetree/bindings/mux/mux-controller.yaml | 26 +- + .../devicetree/bindings/nvmem/brcm,nvram.yaml | 3 + + .../devicetree/bindings/nvmem/mtk-efuse.txt | 2 + + Documentation/devicetree/bindings/nvmem/rmem.yaml | 3 + + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 3 + + .../bindings/phy/amlogic,meson8-hdmi-tx-phy.yaml | 65 + + .../devicetree/bindings/phy/fsl,imx8-pcie-phy.yaml | 92 + + .../bindings/phy/intel,phy-thunderbay-emmc.yaml | 46 + + .../devicetree/bindings/phy/mediatek,tphy.yaml | 18 + + .../bindings/phy/microchip,lan966x-serdes.yaml | 59 + + .../bindings/phy/phy-cadence-sierra.yaml | 9 + + .../bindings/phy/phy-cadence-torrent.yaml | 4 +- + .../bindings/phy/phy-rockchip-inno-usb2.yaml | 44 +- + .../devicetree/bindings/phy/phy-tegra194-p2u.txt | 28 - + .../devicetree/bindings/phy/phy-tegra194-p2u.yaml | 44 + + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 67 + + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 6 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 1 + + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 21 +- + .../bindings/phy/socionext,uniphier-pcie-phy.yaml | 1 + + .../phy/socionext,uniphier-usb3hs-phy.yaml | 1 + + .../phy/socionext,uniphier-usb3ss-phy.yaml | 1 + + .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 76 + + Documentation/devicetree/bindings/spmi/spmi.yaml | 3 - + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 1 + + Documentation/driver-api/fpga/fpga-bridge.rst | 6 +- + Documentation/driver-api/fpga/fpga-mgr.rst | 38 +- + Documentation/driver-api/fpga/fpga-region.rst | 12 +- + Documentation/driver-api/generic-counter.rst | 10 +- + Documentation/trace/coresight/coresight-config.rst | 78 +- + MAINTAINERS | 48 +- + drivers/accessibility/speakup/speakup_acntpc.c | 2 +- + drivers/accessibility/speakup/speakup_dtlk.c | 2 +- + drivers/accessibility/speakup/speakup_keypc.c | 2 +- + drivers/android/binder.c | 437 +++- + drivers/base/property.c | 16 + + drivers/block/paride/bpck.c | 1 + + drivers/bus/mhi/core/boot.c | 2 +- + drivers/bus/mhi/core/init.c | 4 +- + drivers/bus/mhi/core/internal.h | 9 +- + drivers/bus/mhi/core/main.c | 24 +- + drivers/bus/mhi/core/pm.c | 39 +- + drivers/bus/mhi/pci_generic.c | 56 +- + drivers/char/applicom.c | 4 +- + drivers/char/mwave/3780i.h | 2 +- + drivers/comedi/comedi_buf.c | 3 +- + drivers/comedi/comedi_fops.c | 2 +- + drivers/comedi/comedi_pci.c | 3 +- + drivers/comedi/comedi_pcmcia.c | 3 +- + drivers/comedi/comedi_usb.c | 3 +- + drivers/comedi/drivers.c | 3 +- + drivers/comedi/drivers/8255.c | 5 +- + drivers/comedi/drivers/8255_pci.c | 6 +- + drivers/comedi/drivers/addi_apci_1032.c | 2 +- + drivers/comedi/drivers/addi_apci_1500.c | 2 +- + drivers/comedi/drivers/addi_apci_1516.c | 2 +- + drivers/comedi/drivers/addi_apci_1564.c | 2 +- + drivers/comedi/drivers/addi_apci_16xx.c | 3 +- + drivers/comedi/drivers/addi_apci_2032.c | 2 +- + drivers/comedi/drivers/addi_apci_2200.c | 2 +- + drivers/comedi/drivers/addi_apci_3120.c | 2 +- + drivers/comedi/drivers/addi_apci_3501.c | 2 +- + drivers/comedi/drivers/addi_apci_3xxx.c | 3 +- + drivers/comedi/drivers/addi_watchdog.c | 2 +- + drivers/comedi/drivers/adl_pci6208.c | 3 +- + drivers/comedi/drivers/adl_pci7x3x.c | 3 +- + drivers/comedi/drivers/adl_pci8164.c | 3 +- + drivers/comedi/drivers/adl_pci9111.c | 5 +- + drivers/comedi/drivers/adl_pci9118.c | 5 +- + drivers/comedi/drivers/adq12b.c | 3 +- + drivers/comedi/drivers/adv_pci1710.c | 5 +- + drivers/comedi/drivers/adv_pci1720.c | 3 +- + drivers/comedi/drivers/adv_pci1723.c | 3 +- + drivers/comedi/drivers/adv_pci1724.c | 3 +- + drivers/comedi/drivers/adv_pci1760.c | 3 +- + drivers/comedi/drivers/adv_pci_dio.c | 8 +- + drivers/comedi/drivers/aio_aio12_8.c | 7 +- + drivers/comedi/drivers/aio_iiro_16.c | 3 +- + drivers/comedi/drivers/amplc_dio200.c | 2 +- + drivers/comedi/drivers/amplc_dio200_common.c | 7 +- + drivers/comedi/drivers/amplc_dio200_pci.c | 3 +- + drivers/comedi/drivers/amplc_pc236.c | 3 +- + drivers/comedi/drivers/amplc_pc236_common.c | 5 +- + drivers/comedi/drivers/amplc_pc263.c | 2 +- + drivers/comedi/drivers/amplc_pci224.c | 6 +- + drivers/comedi/drivers/amplc_pci230.c | 8 +- + drivers/comedi/drivers/amplc_pci236.c | 3 +- + drivers/comedi/drivers/amplc_pci263.c | 3 +- + drivers/comedi/drivers/c6xdigio.c | 3 +- + drivers/comedi/drivers/cb_das16_cs.c | 6 +- + drivers/comedi/drivers/cb_pcidas.c | 7 +- + drivers/comedi/drivers/cb_pcidas64.c | 5 +- + drivers/comedi/drivers/cb_pcidda.c | 6 +- + drivers/comedi/drivers/cb_pcimdas.c | 7 +- + drivers/comedi/drivers/cb_pcimdda.c | 6 +- + drivers/comedi/drivers/comedi_8254.c | 6 +- + drivers/comedi/drivers/comedi_8255.c | 5 +- + drivers/comedi/drivers/comedi_bond.c | 6 +- + drivers/comedi/drivers/comedi_isadma.c | 6 +- + drivers/comedi/drivers/comedi_parport.c | 3 +- + drivers/comedi/drivers/comedi_test.c | 4 +- + drivers/comedi/drivers/contec_pci_dio.c | 3 +- + drivers/comedi/drivers/dac02.c | 3 +- + drivers/comedi/drivers/daqboard2000.c | 5 +- + drivers/comedi/drivers/das08.c | 7 +- + drivers/comedi/drivers/das08_cs.c | 3 +- + drivers/comedi/drivers/das08_isa.c | 2 +- + drivers/comedi/drivers/das08_pci.c | 3 +- + drivers/comedi/drivers/das16.c | 10 +- + drivers/comedi/drivers/das16m1.c | 7 +- + drivers/comedi/drivers/das1800.c | 8 +- + drivers/comedi/drivers/das6402.c | 6 +- + drivers/comedi/drivers/das800.c | 6 +- + drivers/comedi/drivers/dmm32at.c | 5 +- + drivers/comedi/drivers/dt2801.c | 2 +- + drivers/comedi/drivers/dt2811.c | 3 +- + drivers/comedi/drivers/dt2814.c | 3 +- + drivers/comedi/drivers/dt2815.c | 3 +- + drivers/comedi/drivers/dt2817.c | 2 +- + drivers/comedi/drivers/dt282x.c | 6 +- + drivers/comedi/drivers/dt3000.c | 3 +- + drivers/comedi/drivers/dt9812.c | 3 +- + drivers/comedi/drivers/dyna_pci10xx.c | 3 +- + drivers/comedi/drivers/fl512.c | 3 +- + drivers/comedi/drivers/gsc_hpdi.c | 3 +- + drivers/comedi/drivers/icp_multi.c | 3 +- + drivers/comedi/drivers/ii_pci20kc.c | 2 +- + drivers/comedi/drivers/jr3_pci.c | 3 +- + drivers/comedi/drivers/ke_counter.c | 3 +- + drivers/comedi/drivers/me4000.c | 5 +- + drivers/comedi/drivers/me_daq.c | 3 +- + drivers/comedi/drivers/mf6x4.c | 3 +- + drivers/comedi/drivers/mite.c | 3 +- + drivers/comedi/drivers/mpc624.c | 3 +- + drivers/comedi/drivers/multiq3.c | 3 +- + drivers/comedi/drivers/ni_6527.c | 3 +- + drivers/comedi/drivers/ni_65xx.c | 3 +- + drivers/comedi/drivers/ni_660x.c | 3 +- + drivers/comedi/drivers/ni_670x.c | 3 +- + drivers/comedi/drivers/ni_at_a2150.c | 8 +- + drivers/comedi/drivers/ni_at_ao.c | 6 +- + drivers/comedi/drivers/ni_atmio.c | 5 +- + drivers/comedi/drivers/ni_atmio16d.c | 5 +- + drivers/comedi/drivers/ni_daq_700.c | 3 +- + drivers/comedi/drivers/ni_daq_dio24.c | 5 +- + drivers/comedi/drivers/ni_labpc.c | 3 +- + drivers/comedi/drivers/ni_labpc_common.c | 7 +- + drivers/comedi/drivers/ni_labpc_cs.c | 3 +- + drivers/comedi/drivers/ni_labpc_isadma.c | 5 +- + drivers/comedi/drivers/ni_labpc_pci.c | 3 +- + drivers/comedi/drivers/ni_mio_common.c | 2 +- + drivers/comedi/drivers/ni_mio_cs.c | 4 +- + drivers/comedi/drivers/ni_pcidio.c | 3 +- + drivers/comedi/drivers/ni_pcimio.c | 4 +- + drivers/comedi/drivers/ni_routes.c | 3 +- + drivers/comedi/drivers/ni_routes.h | 2 +- + .../comedi/drivers/ni_routing/ni_route_values.h | 2 +- + drivers/comedi/drivers/ni_routing/tools/.gitignore | 1 + + drivers/comedi/drivers/ni_routing/tools/Makefile | 29 +- + drivers/comedi/drivers/ni_tio.h | 2 +- + drivers/comedi/drivers/ni_usb6501.c | 3 +- + drivers/comedi/drivers/pcl711.c | 6 +- + drivers/comedi/drivers/pcl724.c | 5 +- + drivers/comedi/drivers/pcl726.c | 3 +- + drivers/comedi/drivers/pcl730.c | 2 +- + drivers/comedi/drivers/pcl812.c | 8 +- + drivers/comedi/drivers/pcl816.c | 8 +- + drivers/comedi/drivers/pcl818.c | 8 +- + drivers/comedi/drivers/pcm3724.c | 5 +- + drivers/comedi/drivers/pcmad.c | 2 +- + drivers/comedi/drivers/pcmda12.c | 2 +- + drivers/comedi/drivers/pcmmio.c | 3 +- + drivers/comedi/drivers/pcmuio.c | 3 +- + drivers/comedi/drivers/quatech_daqp_cs.c | 3 +- + drivers/comedi/drivers/rtd520.c | 5 +- + drivers/comedi/drivers/rti800.c | 2 +- + drivers/comedi/drivers/rti802.c | 2 +- + drivers/comedi/drivers/s526.c | 2 +- + drivers/comedi/drivers/s626.c | 3 +- + drivers/comedi/drivers/ssv_dnp.c | 2 +- + drivers/comedi/drivers/usbdux.c | 3 +- + drivers/comedi/drivers/usbduxfast.c | 2 +- + drivers/comedi/drivers/usbduxsigma.c | 3 +- + drivers/comedi/drivers/vmk80xx.c | 3 +- + drivers/comedi/kcomedilib/kcomedilib_main.c | 6 +- + drivers/comedi/proc.c | 2 +- + drivers/comedi/range.c | 2 +- + drivers/counter/104-quad-8.c | 173 +- + drivers/counter/counter-core.c | 186 +- + drivers/counter/ftm-quaddec.c | 36 +- + drivers/counter/intel-qep.c | 46 +- + drivers/counter/interrupt-cnt.c | 38 +- + drivers/counter/microchip-tcb-capture.c | 44 +- + drivers/counter/stm32-lptimer-cnt.c | 51 +- + drivers/counter/stm32-timer-cnt.c | 48 +- + drivers/counter/ti-eqep.c | 52 +- + drivers/extcon/extcon-usb-gpio.c | 2 +- + drivers/extcon/extcon.c | 14 +- + drivers/firmware/google/Kconfig | 6 +- + drivers/firmware/qemu_fw_cfg.c | 21 +- + drivers/firmware/xilinx/zynqmp.c | 40 +- + drivers/fpga/altera-cvp.c | 12 +- + drivers/fpga/altera-fpga2sdram.c | 12 +- + drivers/fpga/altera-freeze-bridge.c | 10 +- + drivers/fpga/altera-hps2fpga.c | 12 +- + drivers/fpga/altera-pr-ip-core.c | 7 +- + drivers/fpga/altera-ps-spi.c | 9 +- + drivers/fpga/dfl-fme-br.c | 10 +- + drivers/fpga/dfl-fme-mgr.c | 22 +- + drivers/fpga/dfl-fme-region.c | 17 +- + drivers/fpga/dfl.c | 12 +- + drivers/fpga/fpga-bridge.c | 122 +- + drivers/fpga/fpga-mgr.c | 215 +- + drivers/fpga/fpga-region.c | 119 +- + drivers/fpga/ice40-spi.c | 9 +- + drivers/fpga/machxo2-spi.c | 9 +- + drivers/fpga/of-fpga-region.c | 12 +- + drivers/fpga/socfpga-a10.c | 16 +- + drivers/fpga/socfpga.c | 9 +- + drivers/fpga/stratix10-soc.c | 18 +- + drivers/fpga/ts73xx-fpga.c | 9 +- + drivers/fpga/versal-fpga.c | 9 +- + drivers/fpga/xilinx-pr-decoupler.c | 17 +- + drivers/fpga/xilinx-spi.c | 11 +- + drivers/fpga/zynq-fpga.c | 16 +- + drivers/fpga/zynqmp-fpga.c | 9 +- + drivers/greybus/es2.c | 2 +- + .../hwtracing/coresight/coresight-cfg-preload.c | 9 +- + drivers/hwtracing/coresight/coresight-config.h | 9 +- + drivers/hwtracing/coresight/coresight-core.c | 2 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 11 +- + drivers/hwtracing/coresight/coresight-stm.c | 10 +- + .../coresight/coresight-syscfg-configfs.c | 87 + + .../coresight/coresight-syscfg-configfs.h | 4 + + drivers/hwtracing/coresight/coresight-syscfg.c | 315 ++- + drivers/hwtracing/coresight/coresight-syscfg.h | 39 +- + drivers/iio/Kconfig | 2 + + drivers/iio/Makefile | 2 + + drivers/iio/accel/bma180.c | 4 +- + drivers/iio/accel/bma220_spi.c | 6 +- + drivers/iio/accel/bmc150-accel-core.c | 2 +- + drivers/iio/accel/kxcjk-1013.c | 5 +- + drivers/iio/accel/mma7455_core.c | 3 +- + drivers/iio/accel/mma7660.c | 8 +- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/accel/mma9553.c | 2 +- + drivers/iio/accel/sca3000.c | 17 +- + drivers/iio/accel/stk8312.c | 2 +- + drivers/iio/accel/stk8ba50.c | 3 +- + drivers/iio/adc/Kconfig | 21 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7192.c | 3 +- + drivers/iio/adc/ad7266.c | 3 +- + drivers/iio/adc/ad7606.h | 2 +- + drivers/iio/adc/ad_sigma_delta.c | 4 - + drivers/iio/adc/at91-sama5d2_adc.c | 38 +- + drivers/iio/adc/axp20x_adc.c | 45 +- + drivers/iio/adc/envelope-detector.c | 3 +- + drivers/iio/adc/hi8435.c | 2 +- + drivers/iio/adc/imx7d_adc.c | 5 +- + drivers/iio/adc/ina2xx-adc.c | 15 +- + drivers/iio/adc/lpc18xx_adc.c | 6 +- + drivers/iio/adc/max9611.c | 20 +- + drivers/iio/adc/mcp3911.c | 9 +- + drivers/iio/adc/rcar-gyroadc.c | 3 +- + drivers/iio/adc/rzg2l_adc.c | 4 +- + drivers/iio/adc/stm32-adc.c | 3 +- + drivers/iio/adc/stmpe-adc.c | 5 +- + drivers/iio/adc/ti-adc12138.c | 14 +- + drivers/iio/adc/ti-ads1015.c | 10 +- + drivers/iio/adc/ti-ads124s08.c | 3 +- + drivers/iio/adc/ti-ads8688.c | 4 +- + drivers/iio/adc/xilinx-ams.c | 1451 ++++++++++++++ + drivers/iio/adc/xilinx-xadc-core.c | 64 +- + drivers/iio/addac/Kconfig | 20 + + drivers/iio/addac/Makefile | 7 + + drivers/iio/addac/ad74413r.c | 1475 ++++++++++++++ + drivers/iio/amplifiers/hmc425a.c | 2 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 2 +- + drivers/iio/chemical/atlas-sensor.c | 4 - + drivers/iio/chemical/sunrise_co2.c | 4 +- + drivers/iio/chemical/vz89x.c | 2 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 57 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 4 +- + drivers/iio/dac/Kconfig | 22 +- + drivers/iio/dac/Makefile | 2 + + drivers/iio/dac/ad3552r.c | 1138 +++++++++++ + drivers/iio/dac/ad5064.c | 4 +- + drivers/iio/dac/ad5380.c | 2 +- + drivers/iio/dac/ad5446.c | 2 +- + drivers/iio/dac/ad5504.c | 2 +- + drivers/iio/dac/ad5624r_spi.c | 2 +- + drivers/iio/dac/ad5686.c | 2 +- + drivers/iio/dac/ad5755.c | 152 +- + drivers/iio/dac/ad5758.c | 3 +- + drivers/iio/dac/ad5766.c | 13 +- + drivers/iio/dac/ad5791.c | 2 +- + drivers/iio/dac/ad7293.c | 934 +++++++++ + drivers/iio/dac/dpot-dac.c | 2 +- + drivers/iio/dac/lpc18xx_dac.c | 3 +- + drivers/iio/dac/max5821.c | 2 +- + drivers/iio/dac/mcp4725.c | 10 +- + drivers/iio/dac/stm32-dac.c | 2 +- + drivers/iio/dac/ti-dac082s085.c | 2 +- + drivers/iio/dac/ti-dac5571.c | 2 +- + drivers/iio/dac/ti-dac7311.c | 2 +- + drivers/iio/dummy/iio_simple_dummy_buffer.c | 2 - + drivers/iio/filter/Kconfig | 18 + + drivers/iio/filter/Makefile | 7 + + drivers/iio/filter/admv8818.c | 665 ++++++ + drivers/iio/frequency/Kconfig | 10 + + drivers/iio/frequency/Makefile | 1 + + drivers/iio/frequency/admv1013.c | 656 ++++++ + drivers/iio/health/afe4403.c | 5 - + drivers/iio/health/afe4404.c | 5 - + drivers/iio/iio_core.h | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 4 +- + drivers/iio/industrialio-buffer.c | 20 +- + drivers/iio/industrialio-core.c | 6 +- + drivers/iio/industrialio-trigger.c | 36 +- + drivers/iio/light/cm3605.c | 6 +- + drivers/iio/light/gp2ap020a00f.c | 5 - + drivers/iio/light/ltr501.c | 42 +- + drivers/iio/magnetometer/ak8975.c | 2 +- + drivers/iio/magnetometer/hmc5843_core.c | 4 +- + drivers/iio/magnetometer/mag3110.c | 6 +- + drivers/iio/potentiometer/mcp41010.c | 6 +- + drivers/iio/potentiostat/lmp91000.c | 4 - + drivers/iio/pressure/mpl3115.c | 16 +- + drivers/iio/pressure/ms5611.h | 6 +- + drivers/iio/pressure/ms5611_core.c | 7 +- + drivers/iio/pressure/ms5611_i2c.c | 11 +- + drivers/iio/pressure/ms5611_spi.c | 17 +- + drivers/iio/proximity/as3935.c | 6 +- + drivers/iio/test/iio-test-format.c | 123 +- + drivers/iio/trigger/iio-trig-interrupt.c | 4 - + drivers/iio/trigger/iio-trig-sysfs.c | 4 - + drivers/iio/trigger/stm32-timer-trigger.c | 4 +- + drivers/interconnect/qcom/Kconfig | 27 + + drivers/interconnect/qcom/Makefile | 6 + + drivers/interconnect/qcom/icc-rpm.c | 64 +- + drivers/interconnect/qcom/icc-rpm.h | 15 +- + drivers/interconnect/qcom/icc-rpmh.c | 10 +- + drivers/interconnect/qcom/msm8916.c | 4 +- + drivers/interconnect/qcom/msm8939.c | 5 +- + drivers/interconnect/qcom/msm8996.c | 2110 ++++++++++++++++++++ + drivers/interconnect/qcom/msm8996.h | 149 ++ + drivers/interconnect/qcom/osm-l3.c | 20 +- + drivers/interconnect/qcom/qcm2290.c | 1363 +++++++++++++ + drivers/interconnect/qcom/sc7280.h | 2 + + drivers/interconnect/qcom/sdm660.c | 7 +- + drivers/interconnect/qcom/sm8150.c | 1 - + drivers/interconnect/qcom/sm8250.c | 1 - + drivers/interconnect/qcom/sm8350.c | 1 - + drivers/interconnect/qcom/sm8450.c | 1987 ++++++++++++++++++ + drivers/interconnect/qcom/sm8450.h | 169 ++ + drivers/misc/cxl/sysfs.c | 3 +- + drivers/misc/eeprom/at25.c | 213 +- + drivers/misc/habanalabs/common/command_buffer.c | 46 +- + .../misc/habanalabs/common/command_submission.c | 389 +++- + drivers/misc/habanalabs/common/context.c | 39 +- + drivers/misc/habanalabs/common/debugfs.c | 97 +- + drivers/misc/habanalabs/common/device.c | 387 ++-- + drivers/misc/habanalabs/common/firmware_if.c | 253 ++- + drivers/misc/habanalabs/common/habanalabs.h | 301 ++- + drivers/misc/habanalabs/common/habanalabs_drv.c | 150 +- + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 195 +- + drivers/misc/habanalabs/common/hw_queue.c | 5 +- + drivers/misc/habanalabs/common/hwmon.c | 209 +- + drivers/misc/habanalabs/common/irq.c | 14 +- + drivers/misc/habanalabs/common/memory.c | 78 +- + drivers/misc/habanalabs/common/mmu/mmu.c | 25 + + drivers/misc/habanalabs/common/mmu/mmu_v1.c | 18 +- + drivers/misc/habanalabs/common/sysfs.c | 56 +- + drivers/misc/habanalabs/gaudi/gaudi.c | 313 ++- + drivers/misc/habanalabs/gaudi/gaudiP.h | 4 +- + drivers/misc/habanalabs/gaudi/gaudi_coresight.c | 4 +- + drivers/misc/habanalabs/goya/goya.c | 165 +- + drivers/misc/habanalabs/goya/goyaP.h | 14 +- + drivers/misc/habanalabs/goya/goya_coresight.c | 4 +- + drivers/misc/habanalabs/goya/goya_hwmgr.c | 31 +- + drivers/misc/habanalabs/include/common/cpucp_if.h | 62 +- + .../misc/habanalabs/include/common/hl_boot_if.h | 4 + + .../habanalabs/include/hw_ip/mmu/mmu_general.h | 19 +- + .../misc/habanalabs/include/hw_ip/mmu/mmu_v1_0.h | 18 +- + .../misc/habanalabs/include/hw_ip/mmu/mmu_v1_1.h | 20 +- + drivers/misc/lattice-ecp3-config.c | 12 +- + drivers/misc/lkdtm/Makefile | 2 +- + drivers/misc/lkdtm/bugs.c | 16 +- + drivers/misc/lkdtm/core.c | 6 +- + drivers/misc/mei/client.c | 4 + + drivers/misc/mei/hbm.c | 20 +- + drivers/misc/mei/hw-txe.c | 6 +- + drivers/misc/mei/init.c | 1 + + drivers/misc/sram.c | 1 + + drivers/misc/uacce/uacce.c | 12 +- + drivers/misc/vmw_vmci/vmci_context.c | 6 +- + drivers/misc/vmw_vmci/vmci_event.c | 3 +- + drivers/most/most_usb.c | 4 +- + drivers/nvmem/core.c | 2 + + drivers/nvmem/mtk-efuse.c | 13 +- + drivers/phy/amlogic/Kconfig | 10 + + drivers/phy/amlogic/Makefile | 1 + + drivers/phy/amlogic/phy-meson8-hdmi-tx.c | 160 ++ + drivers/phy/broadcom/phy-bcm-ns-usb2.c | 54 +- + drivers/phy/cadence/phy-cadence-sierra.c | 1312 +++++++++++- + drivers/phy/cadence/phy-cadence-torrent.c | 6 +- + drivers/phy/freescale/Kconfig | 8 + + drivers/phy/freescale/Makefile | 1 + + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 237 +++ + drivers/phy/intel/Kconfig | 10 + + drivers/phy/intel/Makefile | 1 + + drivers/phy/intel/phy-intel-thunderbay-emmc.c | 509 +++++ + drivers/phy/mediatek/phy-mtk-io.h | 38 + + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 2 + + drivers/phy/mediatek/phy-mtk-tphy.c | 608 +++--- + drivers/phy/mediatek/phy-mtk-xsphy.c | 140 +- + drivers/phy/microchip/Kconfig | 8 + + drivers/phy/microchip/Makefile | 1 + + drivers/phy/microchip/lan966x_serdes.c | 545 +++++ + drivers/phy/microchip/lan966x_serdes_regs.h | 209 ++ + drivers/phy/phy-can-transceiver.c | 4 +- + drivers/phy/qualcomm/Kconfig | 10 + + drivers/phy/qualcomm/Makefile | 1 + + drivers/phy/qualcomm/phy-qcom-edp.c | 674 +++++++ + drivers/phy/qualcomm/phy-qcom-qmp.c | 313 +++ + drivers/phy/qualcomm/phy-qcom-qmp.h | 104 + + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 260 ++- + drivers/phy/socionext/Kconfig | 2 +- + drivers/phy/socionext/phy-uniphier-ahci.c | 201 +- + drivers/phy/socionext/phy-uniphier-pcie.c | 70 +- + drivers/phy/socionext/phy-uniphier-usb3hs.c | 4 + + drivers/phy/socionext/phy-uniphier-usb3ss.c | 14 +- + drivers/phy/st/phy-stm32-usbphyc.c | 10 +- + drivers/phy/tegra/xusb.c | 2 +- + drivers/phy/ti/phy-omap-control.c | 6 +- + drivers/rapidio/switches/Kconfig | 11 - + drivers/rapidio/switches/Makefile | 2 - + drivers/rapidio/switches/tsi568.c | 195 -- + drivers/rapidio/switches/tsi57x.c | 365 ---- + drivers/soc/xilinx/Kconfig | 10 + + drivers/soc/xilinx/Makefile | 1 + + drivers/soc/xilinx/xlnx_event_manager.c | 600 ++++++ + drivers/soc/xilinx/zynqmp_power.c | 54 +- + drivers/soundwire/qcom.c | 6 +- + drivers/spmi/Kconfig | 11 + + drivers/spmi/Makefile | 1 + + drivers/spmi/spmi-mtk-pmif.c | 542 +++++ + drivers/spmi/spmi-pmic-arb.c | 193 +- + drivers/uio/uio.c | 8 +- + drivers/uio/uio_dmem_genirq.c | 6 +- + drivers/virt/nitro_enclaves/Kconfig | 9 + + drivers/virt/nitro_enclaves/ne_misc_dev.c | 174 +- + drivers/virt/nitro_enclaves/ne_misc_dev_test.c | 157 ++ + drivers/virt/nitro_enclaves/ne_pci_dev.c | 1 - + drivers/w1/slaves/w1_ds28e04.c | 26 +- + drivers/w1/slaves/w1_therm.c | 7 +- + include/dt-bindings/iio/addac/adi,ad74413r.h | 21 + + include/dt-bindings/interconnect/qcom,msm8996.h | 163 ++ + include/dt-bindings/interconnect/qcom,qcm2290.h | 94 + + include/dt-bindings/interconnect/qcom,sm8450.h | 171 ++ + include/dt-bindings/mux/ti-serdes.h | 22 + + include/dt-bindings/phy/phy-cadence.h | 9 +- + include/dt-bindings/phy/phy-imx8-pcie.h | 14 + + include/dt-bindings/phy/phy-lan966x-serdes.h | 14 + + include/linux/byteorder/generic.h | 4 +- + .../drivers => include/linux/comedi}/comedi_8254.h | 0 + .../8255.h => include/linux/comedi/comedi_8255.h | 8 +- + .../linux/comedi}/comedi_isadma.h | 0 + {drivers => include/linux}/comedi/comedi_pci.h | 3 +- + {drivers => include/linux}/comedi/comedi_pcmcia.h | 3 +- + {drivers => include/linux}/comedi/comedi_usb.h | 3 +- + {drivers => include/linux}/comedi/comedidev.h | 3 +- + {drivers => include/linux}/comedi/comedilib.h | 0 + include/linux/counter.h | 55 +- + include/linux/firmware/xlnx-event-manager.h | 36 + + include/linux/firmware/xlnx-zynqmp.h | 33 +- + include/linux/fpga/fpga-bridge.h | 30 +- + include/linux/fpga/fpga-mgr.h | 62 +- + include/linux/fpga/fpga-region.h | 36 +- + include/linux/iio/buffer-dma.h | 5 - + include/linux/iio/iio.h | 5 +- + include/linux/iio/trigger.h | 2 + + include/linux/iio/types.h | 1 + + include/linux/mhi.h | 21 +- + include/linux/platform_data/ad5755.h | 102 - + include/linux/property.h | 2 + + include/linux/rio_ids.h | 13 - + {drivers/comedi => include/uapi/linux}/comedi.h | 2 +- + include/uapi/misc/habanalabs.h | 166 +- + net/qrtr/mhi.c | 2 +- + samples/Kconfig | 9 + + samples/Makefile | 1 + + samples/coresight/Makefile | 4 + + samples/coresight/coresight-cfg-sample.c | 73 + + scripts/tags.sh | 126 +- + tools/iio/iio_event_monitor.c | 1 + + tools/testing/selftests/lkdtm/stack-entropy.sh | 16 +- + 524 files changed, 26666 insertions(+), 4544 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-filter-admv8818 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-frequency-admv1013 + create mode 100644 Documentation/devicetree/bindings/iio/adc/xlnx,zynqmp-ams.yaml + create mode 100644 Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad7293.yaml + create mode 100644 Documentation/devicetree/bindings/iio/filter/adi,admv8818.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,admv1013.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcm2290.yaml + delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson8-hdmi-tx-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/intel,phy-thunderbay-emmc.yaml + create mode 100644 Documentation/devicetree/bindings/phy/microchip,lan966x-serdes.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-tegra194-p2u.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-tegra194-p2u.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml + create mode 100644 drivers/iio/adc/xilinx-ams.c + create mode 100644 drivers/iio/addac/Kconfig + create mode 100644 drivers/iio/addac/Makefile + create mode 100644 drivers/iio/addac/ad74413r.c + create mode 100644 drivers/iio/dac/ad3552r.c + create mode 100644 drivers/iio/dac/ad7293.c + create mode 100644 drivers/iio/filter/Kconfig + create mode 100644 drivers/iio/filter/Makefile + create mode 100644 drivers/iio/filter/admv8818.c + create mode 100644 drivers/iio/frequency/admv1013.c + create mode 100644 drivers/interconnect/qcom/msm8996.c + create mode 100644 drivers/interconnect/qcom/msm8996.h + create mode 100644 drivers/interconnect/qcom/qcm2290.c + create mode 100644 drivers/interconnect/qcom/sm8450.c + create mode 100644 drivers/interconnect/qcom/sm8450.h + create mode 100644 drivers/phy/amlogic/phy-meson8-hdmi-tx.c + create mode 100644 drivers/phy/freescale/phy-fsl-imx8m-pcie.c + create mode 100644 drivers/phy/intel/phy-intel-thunderbay-emmc.c + create mode 100644 drivers/phy/mediatek/phy-mtk-io.h + create mode 100644 drivers/phy/microchip/lan966x_serdes.c + create mode 100644 drivers/phy/microchip/lan966x_serdes_regs.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-edp.c + delete mode 100644 drivers/rapidio/switches/tsi568.c + delete mode 100644 drivers/rapidio/switches/tsi57x.c + create mode 100644 drivers/soc/xilinx/xlnx_event_manager.c + create mode 100644 drivers/spmi/spmi-mtk-pmif.c + create mode 100644 drivers/virt/nitro_enclaves/ne_misc_dev_test.c + create mode 100644 include/dt-bindings/iio/addac/adi,ad74413r.h + create mode 100644 include/dt-bindings/interconnect/qcom,msm8996.h + create mode 100644 include/dt-bindings/interconnect/qcom,qcm2290.h + create mode 100644 include/dt-bindings/interconnect/qcom,sm8450.h + create mode 100644 include/dt-bindings/phy/phy-imx8-pcie.h + create mode 100644 include/dt-bindings/phy/phy-lan966x-serdes.h + rename {drivers/comedi/drivers => include/linux/comedi}/comedi_8254.h (100%) + rename drivers/comedi/drivers/8255.h => include/linux/comedi/comedi_8255.h (90%) + rename {drivers/comedi/drivers => include/linux/comedi}/comedi_isadma.h (100%) + rename {drivers => include/linux}/comedi/comedi_pci.h (98%) + rename {drivers => include/linux}/comedi/comedi_pcmcia.h (97%) + rename {drivers => include/linux}/comedi/comedi_usb.h (97%) + rename {drivers => include/linux}/comedi/comedidev.h (99%) + rename {drivers => include/linux}/comedi/comedilib.h (100%) + create mode 100644 include/linux/firmware/xlnx-event-manager.h + delete mode 100644 include/linux/platform_data/ad5755.h + rename {drivers/comedi => include/uapi/linux}/comedi.h (99%) + create mode 100644 samples/coresight/Makefile + create mode 100644 samples/coresight/coresight-cfg-sample.c +Merging extcon/extcon-next (2da3db7f498d extcon: Deduplicate code in extcon_set_state_sync()) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging phy-next/next (09d976b3e8e2 phy: cadence: Sierra: Add support for derived reference clock output) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (bb349fd2d580 soundwire: qcom: remove redundant version number read) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging thunderbolt/next (fa487b2a900d thunderbolt: Add module parameter for CLx disabling) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging vfio/next (2bed2ced40c9 vfio/iommu_type1: replace kfree with kvfree) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci_igd.c | 15 +++++++++------ + drivers/vfio/vfio_iommu_type1.c | 2 +- + 2 files changed, 10 insertions(+), 7 deletions(-) +Merging staging/staging-next (0640d18b15d8 staging: r8188eu: add spaces around P2P_AP_P2P_CH_SWITCH_PROCESS_WK) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/staging/rtl8192e/rtllib_softmac.c +Removing drivers/staging/ralink-gdma/ralink-gdma.c +Removing drivers/staging/ralink-gdma/Makefile +Removing drivers/staging/ralink-gdma/Kconfig +Removing drivers/staging/r8188eu/include/rtl8188e_sreset.h +Removing drivers/staging/r8188eu/include/rtl8188e_led.h +Removing drivers/staging/r8188eu/include/odm_precomp.h +Removing drivers/staging/r8188eu/include/odm_interface.h +Removing drivers/staging/r8188eu/include/ieee80211_ext.h +Removing drivers/staging/r8188eu/hal/rtl8188eu_led.c +Removing drivers/staging/r8188eu/hal/rtl8188e_sreset.c +Removing drivers/staging/r8188eu/hal/odm_interface.c +Removing drivers/staging/mt7621-dma/hsdma-mt7621.c +Removing drivers/staging/mt7621-dma/TODO +Removing drivers/staging/mt7621-dma/Makefile +Removing drivers/staging/mt7621-dma/Kconfig +Removing drivers/staging/fbtft/fb_watterott.c +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 4 - + drivers/staging/Makefile | 2 - + drivers/staging/axis-fifo/axis-fifo.c | 11 +- + drivers/staging/fbtft/Kconfig | 6 - + drivers/staging/fbtft/Makefile | 1 - + drivers/staging/fbtft/fb_sh1106.c | 7 +- + drivers/staging/fbtft/fb_watterott.c | 302 ------- + drivers/staging/fbtft/fbtft.h | 41 + + drivers/staging/greybus/audio_manager_module.c | 3 +- + drivers/staging/greybus/audio_topology.c | 92 +- + drivers/staging/most/dim2/dim2.c | 28 +- + drivers/staging/mt7621-dma/Kconfig | 7 - + drivers/staging/mt7621-dma/Makefile | 4 - + drivers/staging/mt7621-dma/TODO | 5 - + drivers/staging/mt7621-dma/hsdma-mt7621.c | 758 ---------------- + drivers/staging/mt7621-dts/mt7621.dtsi | 38 - + drivers/staging/pi433/rf69.c | 44 +- + drivers/staging/pi433/rf69_enum.h | 12 + + drivers/staging/r8188eu/Makefile | 3 - + drivers/staging/r8188eu/core/rtw_ap.c | 7 +- + drivers/staging/r8188eu/core/rtw_br_ext.c | 11 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 36 +- + drivers/staging/r8188eu/core/rtw_efuse.c | 221 +---- + drivers/staging/r8188eu/core/rtw_ieee80211.c | 73 +- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 19 +- + drivers/staging/r8188eu/core/rtw_led.c | 285 +++--- + drivers/staging/r8188eu/core/rtw_mlme.c | 12 +- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 102 ++- + drivers/staging/r8188eu/core/rtw_p2p.c | 6 - + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 22 +- + drivers/staging/r8188eu/core/rtw_rf.c | 2 +- + drivers/staging/r8188eu/core/rtw_security.c | 22 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 23 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 2 +- + drivers/staging/r8188eu/hal/Hal8188EPwrSeq.c | 100 +-- + drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c | 27 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 1 - + drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 1 - + drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 1 - + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 401 ++++----- + drivers/staging/r8188eu/hal/HalPwrSeqCmd.c | 84 +- + drivers/staging/r8188eu/hal/odm.c | 937 +++++++++----------- + drivers/staging/r8188eu/hal/odm_HWConfig.c | 20 +- + drivers/staging/r8188eu/hal/odm_RTL8188E.c | 176 ++-- + drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 60 +- + drivers/staging/r8188eu/hal/odm_debug.c | 2 +- + drivers/staging/r8188eu/hal/odm_interface.c | 93 -- + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 13 +- + drivers/staging/r8188eu/hal/rtl8188e_dm.c | 25 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 957 +-------------------- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 197 +---- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 65 +- + drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 2 +- + drivers/staging/r8188eu/hal/rtl8188e_sreset.c | 37 - + drivers/staging/r8188eu/hal/rtl8188eu_led.c | 94 -- + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 4 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 263 ++---- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 32 +- + drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 60 +- + drivers/staging/r8188eu/include/Hal8188EPwrSeq.h | 148 +--- + drivers/staging/r8188eu/include/HalPhyRf_8188e.h | 5 - + drivers/staging/r8188eu/include/HalPwrSeqCmd.h | 53 +- + drivers/staging/r8188eu/include/HalVerDef.h | 13 - + drivers/staging/r8188eu/include/drv_types.h | 19 +- + drivers/staging/r8188eu/include/hal_intf.h | 23 +- + drivers/staging/r8188eu/include/ieee80211.h | 3 +- + drivers/staging/r8188eu/include/ieee80211_ext.h | 271 ------ + drivers/staging/r8188eu/include/odm.h | 216 +---- + drivers/staging/r8188eu/include/odm_RTL8188E.h | 6 - + .../staging/r8188eu/include/odm_RegConfig8188E.h | 3 - + drivers/staging/r8188eu/include/odm_interface.h | 59 -- + drivers/staging/r8188eu/include/odm_precomp.h | 54 -- + drivers/staging/r8188eu/include/osdep_service.h | 32 - + drivers/staging/r8188eu/include/rtl8188e_dm.h | 7 +- + drivers/staging/r8188eu/include/rtl8188e_hal.h | 88 +- + drivers/staging/r8188eu/include/rtl8188e_led.h | 16 - + drivers/staging/r8188eu/include/rtl8188e_recv.h | 3 - + drivers/staging/r8188eu/include/rtl8188e_spec.h | 61 -- + drivers/staging/r8188eu/include/rtl8188e_sreset.h | 13 - + drivers/staging/r8188eu/include/rtw_cmd.h | 1 - + drivers/staging/r8188eu/include/rtw_debug.h | 12 - + drivers/staging/r8188eu/include/rtw_eeprom.h | 31 - + drivers/staging/r8188eu/include/rtw_efuse.h | 104 +-- + drivers/staging/r8188eu/include/rtw_io.h | 2 +- + drivers/staging/r8188eu/include/rtw_led.h | 116 +-- + drivers/staging/r8188eu/include/rtw_mlme.h | 12 - + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 5 - + drivers/staging/r8188eu/include/rtw_pwrctrl.h | 7 - + drivers/staging/r8188eu/include/rtw_recv.h | 1 - + drivers/staging/r8188eu/include/rtw_rf.h | 34 - + drivers/staging/r8188eu/include/usb_osintf.h | 1 - + drivers/staging/r8188eu/include/wifi.h | 59 +- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 199 +---- + drivers/staging/r8188eu/os_dep/os_intfs.c | 69 +- + drivers/staging/r8188eu/os_dep/usb_intf.c | 42 +- + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 6 +- + drivers/staging/ralink-gdma/Kconfig | 8 - + drivers/staging/ralink-gdma/Makefile | 4 - + drivers/staging/ralink-gdma/ralink-gdma.c | 917 -------------------- + drivers/staging/rtl8192e/rtllib.h | 2 +- + drivers/staging/rtl8192e/rtllib_module.c | 17 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 6 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 4 +- + drivers/staging/rtl8192u/r8192U_core.c | 13 +- + drivers/staging/rtl8712/rtl8712_efuse.c | 28 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 14 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 5 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 2 +- + drivers/staging/unisys/visornic/visornic_main.c | 8 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.c | 12 +- + .../vc04_services/bcm2835-camera/controls.c | 10 +- + drivers/staging/vc04_services/interface/TODO | 8 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 2 - + drivers/staging/vt6655/card.c | 36 +- + drivers/staging/vt6655/channel.c | 2 +- + drivers/staging/vt6655/device.h | 10 +- + drivers/staging/vt6655/device_main.c | 12 +- + drivers/staging/vt6655/dpc.c | 2 +- + drivers/staging/vt6655/rf.c | 54 +- + drivers/staging/vt6655/rf.h | 2 +- + drivers/staging/wlan-ng/prism2mib.c | 8 - + 124 files changed, 1561 insertions(+), 7289 deletions(-) + delete mode 100644 drivers/staging/fbtft/fb_watterott.c + delete mode 100644 drivers/staging/mt7621-dma/Kconfig + delete mode 100644 drivers/staging/mt7621-dma/Makefile + delete mode 100644 drivers/staging/mt7621-dma/TODO + delete mode 100644 drivers/staging/mt7621-dma/hsdma-mt7621.c + delete mode 100644 drivers/staging/r8188eu/hal/odm_interface.c + delete mode 100644 drivers/staging/r8188eu/hal/rtl8188e_sreset.c + delete mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_led.c + delete mode 100644 drivers/staging/r8188eu/include/ieee80211_ext.h + delete mode 100644 drivers/staging/r8188eu/include/odm_interface.h + delete mode 100644 drivers/staging/r8188eu/include/odm_precomp.h + delete mode 100644 drivers/staging/r8188eu/include/rtl8188e_led.h + delete mode 100644 drivers/staging/r8188eu/include/rtl8188e_sreset.h + delete mode 100644 drivers/staging/ralink-gdma/Kconfig + delete mode 100644 drivers/staging/ralink-gdma/Makefile + delete mode 100644 drivers/staging/ralink-gdma/ralink-gdma.c +Merging iio/togreg (38ac2f038666 iio: chemical: sunrise_co2: set val parameter only on success) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging mux/for-next (949354d5d49a mux: Fix struct mux_state kernel-doc comment) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/driver-model/devres.rst | 1 + + drivers/mux/core.c | 241 ++++++++++++++++++++--- + include/linux/mux/consumer.h | 20 ++ + 3 files changed, 240 insertions(+), 22 deletions(-) +Merging icc/icc-next (01f8938ad036 Merge branch 'icc-qcm2290' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging dmaengine/next (2577394f4b01 Merge tag 'dmaengine_topic_slave_id_removal_5.17' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging drivers/dma/ti/k3-udma.c +Auto-merging drivers/dma/idxd/submit.c +CONFLICT (content): Merge conflict in drivers/dma/idxd/submit.c +Auto-merging drivers/dma/idxd/irq.c +Resolved 'drivers/dma/idxd/submit.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3090621e2c21] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 7 + + .../devicetree/bindings/dma/arm-pl08x.yaml | 4 + + .../devicetree/bindings/dma/ingenic,dma.yaml | 42 ++-- + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 3 + + .../devicetree/bindings/dma/ti/k3-bcdma.yaml | 1 + + .../devicetree/bindings/dma/ti/k3-pktdma.yaml | 1 + + Documentation/driver-api/dmaengine/dmatest.rst | 17 +- + Documentation/driver-api/dmaengine/provider.rst | 23 ++ + drivers/dma/at_xdmac.c | 8 +- + drivers/dma/dma-jz4780.c | 118 ++++++++--- + drivers/dma/dmaengine.c | 7 + + drivers/dma/idxd/device.c | 38 +++- + drivers/dma/idxd/dma.c | 28 ++- + drivers/dma/idxd/idxd.h | 30 ++- + drivers/dma/idxd/init.c | 101 ++++----- + drivers/dma/idxd/irq.c | 234 ++++++++++++++++++++- + drivers/dma/idxd/registers.h | 1 + + drivers/dma/idxd/submit.c | 73 ++++--- + drivers/dma/idxd/sysfs.c | 37 +++- + drivers/dma/ppc4xx/adma.c | 3 +- + drivers/dma/qcom/gpi.c | 4 +- + drivers/dma/sh/shdma-base.c | 6 +- + drivers/dma/stm32-mdma.c | 76 +++---- + drivers/dma/ti/Makefile | 3 +- + drivers/dma/ti/edma.c | 3 +- + drivers/dma/ti/k3-psil-j721s2.c | 167 +++++++++++++++ + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 1 + + drivers/dma/ti/k3-udma.c | 1 + + drivers/dma/xilinx/xilinx_dma.c | 133 +++++++++++- + include/linux/dmaengine.h | 20 ++ + 31 files changed, 958 insertions(+), 233 deletions(-) + create mode 100644 drivers/dma/ti/k3-psil-j721s2.c +Merging cgroup/for-next (1815775e7454 cgroup: return early if it is already on preloaded list) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/cgroup-defs.h +Merge made by the 'recursive' strategy. + include/linux/cgroup-defs.h | 2 +- + include/trace/events/cgroup.h | 12 ++++++------ + kernel/cgroup/cgroup.c | 6 +++--- + kernel/cgroup/cpuset.c | 14 +++----------- + kernel/cgroup/rstat.c | 2 +- + 5 files changed, 14 insertions(+), 22 deletions(-) +Merging scsi/for-next (083f067c8257 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/ufs/ufshpb.c +Auto-merging drivers/scsi/sd_zbc.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 - + drivers/message/fusion/mptbase.c | 6 +- + drivers/scsi/a100u2w.c | 2 - + drivers/scsi/atp870u.c | 1 - + drivers/scsi/bfa/bfad_attr.c | 2 +- + drivers/scsi/dc395x.c | 3 +- + drivers/scsi/elx/efct/efct_driver.c | 2 +- + drivers/scsi/elx/efct/efct_hw.c | 10 +- + drivers/scsi/elx/efct/efct_io.c | 2 +- + drivers/scsi/elx/libefc/efc_cmds.c | 4 +- + drivers/scsi/elx/libefc/efc_els.c | 4 +- + drivers/scsi/elx/libefc_sli/sli4.c | 14 +- + drivers/scsi/hisi_sas/hisi_sas.h | 6 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 357 ++++++++++++++----------------- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 11 +- + drivers/scsi/hosts.c | 15 +- + drivers/scsi/hpsa.c | 2 - + drivers/scsi/initio.c | 2 - + drivers/scsi/libsas/sas_discover.c | 1 - + drivers/scsi/libsas/sas_scsi_host.c | 7 +- + drivers/scsi/lpfc/lpfc.h | 97 ++++----- + drivers/scsi/lpfc/lpfc_attr.c | 62 ++++-- + drivers/scsi/lpfc/lpfc_debugfs.c | 27 ++- + drivers/scsi/lpfc/lpfc_debugfs.h | 2 +- + drivers/scsi/lpfc/lpfc_els.c | 22 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 10 +- + drivers/scsi/lpfc/lpfc_hw.h | 29 ++- + drivers/scsi/lpfc/lpfc_init.c | 41 ++-- + drivers/scsi/lpfc/lpfc_nportdisc.c | 6 + + drivers/scsi/lpfc/lpfc_scsi.c | 8 +- + drivers/scsi/lpfc/lpfc_sli.c | 38 ++-- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 83 +++++-- + drivers/scsi/megaraid/megaraid_mbox.c | 1 - + drivers/scsi/pm8001/Makefile | 7 +- + drivers/scsi/pm8001/pm8001_ctl.c | 24 +-- + drivers/scsi/pm8001/pm8001_hwi.c | 33 ++- + drivers/scsi/pm8001/pm8001_init.c | 4 +- + drivers/scsi/pm8001/pm8001_sas.c | 16 ++ + drivers/scsi/pm8001/pm80xx_hwi.c | 38 ++-- + drivers/scsi/pm8001/pm80xx_tracepoints.c | 10 + + drivers/scsi/pm8001/pm80xx_tracepoints.h | 113 ++++++++++ + drivers/scsi/pmcraid.c | 1 - + drivers/scsi/qedi/qedi_main.c | 8 +- + drivers/scsi/qla2xxx/qla_attr.c | 6 + + drivers/scsi/qla2xxx/qla_init.c | 10 +- + drivers/scsi/qla2xxx/qla_nvme.c | 5 +- + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + drivers/scsi/scsi.c | 5 +- + drivers/scsi/scsi_debugfs.c | 1 + + drivers/scsi/scsi_error.c | 112 +++++----- + drivers/scsi/scsi_pm.c | 1 - + drivers/scsi/scsi_priv.h | 3 +- + drivers/scsi/scsi_scan.c | 4 +- + drivers/scsi/scsi_sysfs.c | 7 +- + drivers/scsi/sd.c | 1 - + drivers/scsi/sd_zbc.c | 6 +- + drivers/scsi/ufs/Kconfig | 15 +- + drivers/scsi/ufs/tc-dwc-g210-pci.c | 1 - + drivers/scsi/ufs/ufs-exynos.c | 4 +- + drivers/scsi/ufs/ufs-hisi.c | 8 +- + drivers/scsi/ufs/ufshcd-pci.c | 2 - + drivers/scsi/ufs/ufshcd-pltfrm.c | 2 - + drivers/scsi/ufs/ufshcd.c | 347 ++++++++++++++++++------------ + drivers/scsi/ufs/ufshcd.h | 20 +- + drivers/scsi/ufs/ufshpb.c | 1 - + include/scsi/scsi_host.h | 6 - + 67 files changed, 986 insertions(+), 720 deletions(-) + create mode 100644 drivers/scsi/pm8001/pm80xx_tracepoints.c + create mode 100644 drivers/scsi/pm8001/pm80xx_tracepoints.h +Merging scsi-mkp/for-next (c77b1f8a8fae scsi: mpi3mr: Bump driver version to 8.0.0.61.0) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/sr.c +Auto-merging drivers/scsi/ch.c +Merge made by the 'recursive' strategy. + block/blk-pm.c | 22 +- + drivers/scsi/ch.c | 6 +- + drivers/scsi/hisi_sas/hisi_sas.h | 1 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 39 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 24 +- + drivers/scsi/initio.c | 3 +- + drivers/scsi/libsas/sas_event.c | 77 +- + drivers/scsi/libsas/sas_expander.c | 3 + + drivers/scsi/libsas/sas_init.c | 49 +- + drivers/scsi/libsas/sas_internal.h | 2 + + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 603 +++++++++--- + drivers/scsi/mpi3mr/mpi/mpi30_image.h | 59 +- + drivers/scsi/mpi3mr/mpi/mpi30_init.h | 15 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 128 ++- + drivers/scsi/mpi3mr/mpi/mpi30_pci.h | 44 + + drivers/scsi/mpi3mr/mpi/mpi30_sas.h | 14 + + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 31 +- + drivers/scsi/mpi3mr/mpi3mr.h | 126 ++- + drivers/scsi/mpi3mr/mpi3mr_debug.h | 133 ++- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 1451 +++++++++++++++++++---------- + drivers/scsi/mpi3mr/mpi3mr_os.c | 771 ++++++++++++--- + drivers/scsi/mvsas/mv_sas.c | 5 + + drivers/scsi/myrb.c | 2 +- + drivers/scsi/myrs.c | 10 +- + drivers/scsi/pmcraid.c | 4 +- + drivers/scsi/scsi_pm.c | 2 +- + drivers/scsi/snic/snic_disc.c | 2 +- + drivers/scsi/sr.c | 2 +- + drivers/scsi/sr_vendor.c | 4 +- + include/linux/blk-pm.h | 2 +- + include/scsi/libsas.h | 2 + + 31 files changed, 2728 insertions(+), 908 deletions(-) + create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_pci.h +Merging vhost/linux-next (e2f504111891 vdpa: Mark vdpa_config_ops.get_vq_notification as optional) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging net/9p/trans_virtio.c +Auto-merging mm/vmscan.c +Auto-merging kernel/signal.c +Auto-merging kernel/fork.c +Auto-merging include/uapi/linux/virtio_iommu.h +CONFLICT (content): Merge conflict in include/uapi/linux/virtio_iommu.h +Auto-merging include/linux/sched.h +Auto-merging fs/io_uring.c +Auto-merging fs/io-wq.c +Auto-merging fs/fuse/virtio_fs.c +Auto-merging drivers/vdpa/mlx5/net/mlx5_vnet.c +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/iommu/virtio-iommu.c +CONFLICT (content): Merge conflict in drivers/iommu/virtio-iommu.c +Auto-merging drivers/i2c/busses/i2c-virtio.c +Auto-merging drivers/gpio/gpio-virtio.c +Auto-merging drivers/firmware/arm_scmi/virtio.c +Auto-merging drivers/bluetooth/virtio_bt.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/kernel/fpu/core.c +Auto-merging arch/um/kernel/process.c +Auto-merging arch/um/drivers/virt-pci.c +Auto-merging arch/s390/kernel/process.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm/kernel/process.c +Auto-merging MAINTAINERS +Resolved 'drivers/iommu/virtio-iommu.c' using previous resolution. +Resolved 'include/uapi/linux/virtio_iommu.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6e4fc054e653] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-vdpa | 57 ++++++++++++ + MAINTAINERS | 1 + + arch/alpha/kernel/process.c | 2 +- + arch/arc/kernel/process.c | 2 +- + arch/arm/kernel/process.c | 2 +- + arch/arm64/kernel/process.c | 2 +- + arch/csky/kernel/process.c | 2 +- + arch/h8300/kernel/process.c | 2 +- + arch/hexagon/kernel/process.c | 2 +- + arch/ia64/kernel/process.c | 2 +- + arch/m68k/kernel/process.c | 2 +- + arch/microblaze/kernel/process.c | 2 +- + arch/mips/kernel/process.c | 2 +- + arch/nds32/kernel/process.c | 2 +- + arch/nios2/kernel/process.c | 2 +- + arch/openrisc/kernel/process.c | 2 +- + arch/parisc/kernel/process.c | 2 +- + arch/powerpc/kernel/process.c | 2 +- + arch/riscv/kernel/process.c | 2 +- + arch/s390/kernel/process.c | 2 +- + arch/sh/kernel/process_32.c | 2 +- + arch/sparc/kernel/process_32.c | 2 +- + arch/sparc/kernel/process_64.c | 2 +- + arch/um/drivers/virt-pci.c | 2 +- + arch/um/kernel/process.c | 2 +- + arch/x86/kernel/fpu/core.c | 4 +- + arch/x86/kernel/process.c | 2 +- + arch/xtensa/kernel/process.c | 2 +- + drivers/block/virtio_blk.c | 4 +- + drivers/bluetooth/virtio_bt.c | 20 ++++- + drivers/char/hw_random/virtio-rng.c | 2 +- + drivers/char/virtio_console.c | 4 +- + drivers/crypto/virtio/virtio_crypto_core.c | 8 +- + drivers/firmware/arm_scmi/virtio.c | 2 +- + drivers/gpio/gpio-virtio.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 2 +- + drivers/i2c/busses/i2c-virtio.c | 2 +- + drivers/iommu/virtio-iommu.c | 2 +- + drivers/net/caif/caif_virtio.c | 2 +- + drivers/net/virtio_net.c | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/nvdimm/virtio_pmem.c | 2 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + drivers/scsi/virtio_scsi.c | 2 +- + drivers/vdpa/alibaba/eni_vdpa.c | 12 --- + drivers/vdpa/ifcvf/ifcvf_base.c | 41 ++++++--- + drivers/vdpa/ifcvf/ifcvf_base.h | 9 +- + drivers/vdpa/ifcvf/ifcvf_main.c | 24 +---- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 1 + + drivers/vdpa/vdpa.c | 74 +++++++++++++++ + drivers/vdpa/vdpa_user/vduse_dev.c | 3 +- + drivers/vhost/vdpa.c | 2 +- + drivers/vhost/vhost.c | 139 +++++++++++++++-------------- + drivers/vhost/vhost.h | 16 +++- + drivers/virtio/virtio.c | 6 ++ + drivers/virtio/virtio_balloon.c | 2 +- + drivers/virtio/virtio_input.c | 2 +- + drivers/virtio/virtio_mem.c | 112 +++++++++++++++-------- + fs/fuse/virtio_fs.c | 4 +- + fs/io-wq.c | 15 ++-- + fs/io_uring.c | 11 ++- + include/linux/sched.h | 1 + + include/linux/sched/task.h | 13 ++- + include/linux/vdpa.h | 4 +- + include/linux/virtio.h | 1 + + kernel/fork.c | 93 +++++++++++++++---- + kernel/signal.c | 4 +- + mm/vmscan.c | 4 +- + net/9p/trans_virtio.c | 2 +- + net/vmw_vsock/virtio_transport.c | 4 +- + sound/virtio/virtio_card.c | 4 +- + 71 files changed, 530 insertions(+), 247 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-vdpa +Merging rpmsg/for-next (feb19d833fa1 Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging drivers/rpmsg/virtio_rpmsg_bus.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 5 + + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 28 +++ + .../bindings/remoteproc/renesas,rcar-rproc.yaml | 65 ++++++ + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 3 + + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 8 +- + MAINTAINERS | 2 - + drivers/hwspinlock/stm32_hwspinlock.c | 58 ++++-- + drivers/remoteproc/Kconfig | 11 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/imx_rproc.c | 9 +- + drivers/remoteproc/ingenic_rproc.c | 5 +- + drivers/remoteproc/mtk_scp_ipi.c | 4 +- + drivers/remoteproc/qcom_pil_info.c | 2 +- + drivers/remoteproc/qcom_q6v5_pas.c | 38 ++++ + drivers/remoteproc/rcar_rproc.c | 224 +++++++++++++++++++++ + drivers/remoteproc/remoteproc_core.c | 4 +- + drivers/remoteproc/remoteproc_coredump.c | 2 +- + drivers/remoteproc/st_slim_rproc.c | 2 +- + drivers/remoteproc/stm32_rproc.c | 2 +- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 1 + + drivers/remoteproc/ti_k3_r5_remoteproc.c | 5 +- + drivers/rpmsg/qcom_glink_native.c | 2 +- + drivers/rpmsg/qcom_smd.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 7 +- + drivers/rpmsg/rpmsg_core.c | 44 ++-- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + 26 files changed, 473 insertions(+), 63 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/renesas,rcar-rproc.yaml + create mode 100644 drivers/remoteproc/rcar_rproc.c +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (80f60eba9cee gpio: dwapb: Switch to use fwnode instead of of_node) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging tools/testing/selftests/gpio/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/gpio/Makefile +Auto-merging drivers/gpio/gpio-aspeed-sgpio.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Removing Documentation/devicetree/bindings/gpio/nvidia,tegra20-gpio.txt +Removing Documentation/devicetree/bindings/gpio/nvidia,tegra186-gpio.txt +Removing Documentation/devicetree/bindings/gpio/gpio-samsung.txt +Resolved 'tools/testing/selftests/gpio/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4b7506304d57] Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/gpio/gpio-sim.rst | 134 ++ + .../devicetree/bindings/gpio/gpio-samsung.txt | 41 - + .../devicetree/bindings/gpio/gpio-vf610.yaml | 3 + + .../bindings/gpio/mstar,msc313-gpio.yaml | 4 +- + .../bindings/gpio/nvidia,tegra186-gpio.txt | 165 -- + .../bindings/gpio/nvidia,tegra186-gpio.yaml | 214 +++ + .../bindings/gpio/nvidia,tegra20-gpio.txt | 40 - + .../bindings/gpio/nvidia,tegra20-gpio.yaml | 110 ++ + .../devicetree/bindings/gpio/sifive,gpio.yaml | 3 +- + drivers/gpio/Kconfig | 18 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-adnp.c | 1 - + drivers/gpio/gpio-aggregator.c | 11 +- + drivers/gpio/gpio-amdpt.c | 12 +- + drivers/gpio/gpio-arizona.c | 5 +- + drivers/gpio/gpio-aspeed-sgpio.c | 32 +- + drivers/gpio/gpio-aspeed.c | 52 +- + drivers/gpio/gpio-bcm-kona.c | 2 +- + drivers/gpio/gpio-bd71828.c | 1 - + drivers/gpio/gpio-brcmstb.c | 3 +- + drivers/gpio/gpio-creg-snps.c | 2 +- + drivers/gpio/gpio-davinci.c | 1 - + drivers/gpio/gpio-dwapb.c | 15 +- + drivers/gpio/gpio-eic-sprd.c | 1 - + drivers/gpio/gpio-em.c | 1 - + drivers/gpio/gpio-ge.c | 1 - + drivers/gpio/gpio-grgpio.c | 1 - + drivers/gpio/gpio-gw-pld.c | 2 - + drivers/gpio/gpio-lpc32xx.c | 2 +- + drivers/gpio/gpio-max3191x.c | 2 +- + drivers/gpio/gpio-ml-ioh.c | 52 +- + drivers/gpio/gpio-msc313.c | 266 +++- + drivers/gpio/gpio-mt7621.c | 6 +- + drivers/gpio/gpio-mvebu.c | 1 - + drivers/gpio/gpio-omap.c | 3 - + drivers/gpio/gpio-palmas.c | 4 +- + drivers/gpio/gpio-pch.c | 42 +- + drivers/gpio/gpio-pmic-eic-sprd.c | 1 - + drivers/gpio/gpio-pxa.c | 8 +- + drivers/gpio/gpio-raspberrypi-exp.c | 1 - + drivers/gpio/gpio-rda.c | 3 - + drivers/gpio/gpio-regmap.c | 6 +- + drivers/gpio/gpio-rockchip.c | 21 +- + drivers/gpio/gpio-sama5d2-piobu.c | 1 - + drivers/gpio/gpio-sch.c | 2 +- + drivers/gpio/gpio-sim.c | 1592 ++++++++++++++++++++ + drivers/gpio/gpio-sprd.c | 1 - + drivers/gpio/gpio-sta2x11.c | 2 +- + drivers/gpio/gpio-stmpe.c | 1 - + drivers/gpio/gpio-tc3589x.c | 1 - + drivers/gpio/gpio-tegra186.c | 129 +- + drivers/gpio/gpio-tps65218.c | 3 - + drivers/gpio/gpio-tps6586x.c | 5 +- + drivers/gpio/gpio-tps65910.c | 6 +- + drivers/gpio/gpio-twl6040.c | 5 +- + drivers/gpio/gpio-vf610.c | 1 - + drivers/gpio/gpio-wm831x.c | 5 +- + drivers/gpio/gpio-xlp.c | 147 +- + drivers/gpio/gpiolib-acpi.c | 54 +- + drivers/gpio/gpiolib-of.c | 3 + + drivers/gpio/gpiolib.c | 73 +- + include/dt-bindings/gpio/msc313-gpio.h | 71 + + include/dt-bindings/gpio/tegra234-gpio.h | 63 + + include/dt-bindings/gpio/tegra241-gpio.h | 42 + + include/linux/gpio/consumer.h | 2 - + include/linux/gpio/driver.h | 2 + + include/linux/gpio/machine.h | 2 + + tools/testing/selftests/gpio/.gitignore | 2 + + tools/testing/selftests/gpio/Makefile | 4 +- + tools/testing/selftests/gpio/config | 1 + + tools/testing/selftests/gpio/gpio-chip-info.c | 57 + + tools/testing/selftests/gpio/gpio-line-name.c | 55 + + tools/testing/selftests/gpio/gpio-sim.sh | 396 +++++ + 73 files changed, 3405 insertions(+), 617 deletions(-) + create mode 100644 Documentation/admin-guide/gpio/gpio-sim.rst + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-samsung.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/nvidia,tegra186-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/nvidia,tegra186-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/nvidia,tegra20-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/nvidia,tegra20-gpio.yaml + create mode 100644 drivers/gpio/gpio-sim.c + create mode 100644 include/dt-bindings/gpio/tegra234-gpio.h + create mode 100644 include/dt-bindings/gpio/tegra241-gpio.h + create mode 100644 tools/testing/selftests/gpio/gpio-chip-info.c + create mode 100644 tools/testing/selftests/gpio/gpio-line-name.c + create mode 100755 tools/testing/selftests/gpio/gpio-sim.sh +Merging gpio-intel/for-next (9d5f0f6644b1 gpio: sch: fix typo in a comment) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (acd6fb558aa8 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging drivers/pinctrl/Makefile +CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile +Auto-merging drivers/pinctrl/Kconfig +CONFLICT (content): Merge conflict in drivers/pinctrl/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml +Resolved 'drivers/pinctrl/Kconfig' using previous resolution. +Resolved 'drivers/pinctrl/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 112450e83e51] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/pinctrl/actions,s500-pinctrl.yaml | 3 + + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 1 + + .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 3 + + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 3 + + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 3 + + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6318-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm63268-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6328-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6358-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6362-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6368-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,ns-pinmux.yaml | 3 +- + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 7 +- + .../bindings/pinctrl/cirrus,lochnagar.yaml | 3 + + .../devicetree/bindings/pinctrl/cirrus,madera.yaml | 3 + + .../bindings/pinctrl/fsl,imx8mm-pinctrl.yaml | 3 + + .../bindings/pinctrl/fsl,imx8mn-pinctrl.yaml | 3 + + .../bindings/pinctrl/fsl,imx8mp-pinctrl.yaml | 3 + + .../bindings/pinctrl/fsl,imx8mq-pinctrl.yaml | 3 + + .../bindings/pinctrl/fsl,imx8ulp-pinctrl.yaml | 3 + + .../devicetree/bindings/pinctrl/fsl,imxrt1050.yaml | 79 + + .../bindings/pinctrl/ingenic,pinctrl.yaml | 8 +- + .../devicetree/bindings/pinctrl/intel,lgm-io.yaml | 3 + + .../bindings/pinctrl/intel,pinctrl-thunderbay.yaml | 119 ++ + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt6797-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 3 + + .../bindings/pinctrl/mscc,ocelot-pinctrl.txt | 3 +- + .../devicetree/bindings/pinctrl/pincfg-node.yaml | 3 + + .../bindings/pinctrl/pinctrl-bindings.txt | 41 +- + .../bindings/pinctrl/pinctrl-mt8192.yaml | 3 + + .../bindings/pinctrl/pinctrl-mt8195.yaml | 341 ++-- + .../devicetree/bindings/pinctrl/pinctrl.yaml | 45 + + .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,lpass-lpi-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,mdm9607-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 3 + + .../bindings/pinctrl/qcom,qcm2290-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sc8180x-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sdx65-pinctrl.yaml | 191 +++ + .../bindings/pinctrl/qcom,sm6115-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sm6125-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,sm6350-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sm8350-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,sm8450-pinctrl.yaml | 143 ++ + .../bindings/pinctrl/qcom,tlmm-common.yaml | 3 + + .../bindings/pinctrl/ralink,rt2880-pinmux.yaml | 3 + + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 3 + + .../bindings/pinctrl/renesas,rza1-ports.yaml | 3 + + .../bindings/pinctrl/renesas,rza2-pinctrl.yaml | 3 + + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 5 + + .../bindings/pinctrl/renesas,rzn1-pinctrl.yaml | 3 + + .../bindings/pinctrl/rockchip,pinctrl.yaml | 3 + + .../bindings/pinctrl/samsung-pinctrl.txt | 1 + + .../pinctrl/socionext,uniphier-pinctrl.yaml | 44 +- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 3 + + .../bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 5 +- + .../bindings/pinctrl/xlnx,zynq-pinctrl.yaml | 3 + + .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 3 + + MAINTAINERS | 5 + + arch/arm/boot/dts/bcm2711.dtsi | 2 + + arch/arm/boot/dts/bcm283x.dtsi | 2 + + drivers/gpio/gpio-mockup.c | 23 +- + drivers/pinctrl/Kconfig | 450 +++--- + drivers/pinctrl/Makefile | 48 +- + drivers/pinctrl/actions/pinctrl-owl.c | 1 - + drivers/pinctrl/aspeed/Kconfig | 2 +- + drivers/pinctrl/bcm/Kconfig | 2 + + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 44 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 1 - + drivers/pinctrl/bcm/pinctrl-ns.c | 163 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 1 - + drivers/pinctrl/cirrus/pinctrl-lochnagar.c | 3 - + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 5 +- + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx.c | 17 +- + drivers/pinctrl/freescale/pinctrl-imxrt1050.c | 349 ++++ + drivers/pinctrl/intel/pinctrl-baytrail.c | 2 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 130 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 7 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 2 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 7 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 85 +- + drivers/pinctrl/pinconf-generic.c | 2 + + drivers/pinctrl/pinctrl-amd.c | 3 - + drivers/pinctrl/pinctrl-apple-gpio.c | 105 +- + drivers/pinctrl/pinctrl-as3722.c | 13 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 1 - + drivers/pinctrl/pinctrl-at91.c | 1 - + drivers/pinctrl/pinctrl-da9062.c | 6 +- + drivers/pinctrl/pinctrl-digicolor.c | 5 +- + drivers/pinctrl/pinctrl-keembay.c | 87 +- + drivers/pinctrl/pinctrl-max77620.c | 11 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 1 - + drivers/pinctrl/pinctrl-microchip-sgpio.c | 45 +- + drivers/pinctrl/pinctrl-ocelot.c | 486 +++++- + drivers/pinctrl/pinctrl-oxnas.c | 1 - + drivers/pinctrl/pinctrl-pic32.c | 2 +- + drivers/pinctrl/pinctrl-rk805.c | 12 +- + drivers/pinctrl/pinctrl-rockchip.c | 161 +- + drivers/pinctrl/pinctrl-st.c | 116 +- + drivers/pinctrl/pinctrl-stmfx.c | 1 - + drivers/pinctrl/pinctrl-sx150x.c | 3 - + drivers/pinctrl/pinctrl-thunderbay.c | 1322 +++++++++++++++ + drivers/pinctrl/pinctrl-xway.c | 1 - + drivers/pinctrl/pinctrl-zynqmp.c | 10 +- + drivers/pinctrl/pinmux.c | 2 +- + drivers/pinctrl/pinmux.h | 4 +- + drivers/pinctrl/qcom/Kconfig | 18 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-msm.c | 16 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 10 + + drivers/pinctrl/qcom/pinctrl-sc7280.c | 75 +- + drivers/pinctrl/qcom/pinctrl-sdx65.c | 967 +++++++++++ + drivers/pinctrl/qcom/pinctrl-sm8450.c | 1689 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 + + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 1 - + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 1 - + drivers/pinctrl/renesas/pfc-r8a779a0.c | 4 +- + drivers/pinctrl/renesas/pinctrl-rza1.c | 6 +- + drivers/pinctrl/renesas/pinctrl-rza2.c | 1 - + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 310 ++-- + drivers/pinctrl/renesas/pinctrl.c | 9 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 81 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 11 +- + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + drivers/pinctrl/spear/pinctrl-plgpio.c | 149 +- + drivers/pinctrl/spear/pinctrl-spear.c | 10 +- + drivers/pinctrl/spear/pinctrl-spear.h | 12 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 8 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 1 - + include/linux/pinctrl/pinconf-generic.h | 3 + + include/linux/string_helpers.h | 4 + + lib/string_helpers.c | 64 + + 144 files changed, 7138 insertions(+), 1259 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imxrt1050.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/intel,pinctrl-thunderbay.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sdx65-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8450-pinctrl.yaml + create mode 100644 drivers/pinctrl/freescale/pinctrl-imxrt1050.c + create mode 100644 drivers/pinctrl/pinctrl-thunderbay.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sdx65.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8450.c +Merging pinctrl-intel/for-next (db1b2a8caf5b pinctrl: cherryview: Use temporary variable for struct device) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (ea7e26ebe6a9 pinctrl: renesas: r8a779a0: Align comments) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (a382d568f144 pinctrl: samsung: Use platform_get_irq_optional() to get the interrupt) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (3f0565451cc0 dt-bindings: pwm: Avoid selecting schema on node name match) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Auto-merging drivers/pwm/core.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/pwm/pwm.yaml | 2 + + drivers/pwm/core.c | 139 ++++++++++++++----------- + drivers/pwm/pwm-img.c | 35 +++++-- + drivers/pwm/pwm-twl.c | 62 +++++++++-- + drivers/pwm/pwm-vt8500.c | 57 ++++++++-- + 5 files changed, 213 insertions(+), 82 deletions(-) +Merging userns/for-next (2de7290d1e9c Merge of signal-for-v5.17, and ucount-rlimit-fixes-for-v5.16 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging tools/objtool/check.c +Auto-merging net/bluetooth/cmtp/core.c +Auto-merging kernel/signal.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/module.c +Auto-merging kernel/futex/core.c +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging include/linux/sched/task.h +Auto-merging include/linux/sched.h +Auto-merging fs/signalfd.c +Auto-merging fs/nfsd/nfssvc.c +CONFLICT (content): Merge conflict in fs/nfsd/nfssvc.c +Auto-merging fs/nfs/nfs4state.c +Auto-merging fs/nfs/callback.c +Auto-merging fs/io-wq.h +Auto-merging fs/io-wq.c +Auto-merging fs/cifs/connect.c +Auto-merging drivers/net/wireless/rsi/rsi_91x_main.c +Auto-merging arch/x86/entry/entry_64.S +Auto-merging arch/x86/entry/entry_32.S +Auto-merging arch/s390/kernel/process.c +Auto-merging arch/s390/kernel/nmi.c +Auto-merging arch/parisc/kernel/traps.c +Auto-merging arch/csky/kernel/traps.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/arm/mm/fault.c +Auto-merging arch/arm/kernel/traps.c +Resolved 'fs/nfsd/nfssvc.c' using previous resolution. +Resolved 'kernel/fork.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ceb8cb70378a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/traps.c | 6 +- + arch/alpha/mm/fault.c | 2 +- + arch/arm/kernel/traps.c | 2 +- + arch/arm/mm/fault.c | 2 +- + arch/arm64/kernel/traps.c | 2 +- + arch/arm64/mm/fault.c | 2 +- + arch/csky/abiv1/alignment.c | 2 +- + arch/csky/kernel/traps.c | 2 +- + arch/csky/mm/fault.c | 2 +- + arch/h8300/kernel/traps.c | 3 +- + arch/h8300/mm/fault.c | 2 +- + arch/hexagon/kernel/traps.c | 2 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/ia64/kernel/traps.c | 2 +- + arch/ia64/mm/fault.c | 2 +- + arch/m68k/kernel/traps.c | 2 +- + arch/m68k/mm/fault.c | 2 +- + arch/microblaze/kernel/exceptions.c | 4 +- + arch/mips/kernel/traps.c | 2 +- + arch/nds32/kernel/fpu.c | 2 +- + arch/nds32/kernel/traps.c | 8 +-- + arch/nios2/kernel/traps.c | 4 +- + arch/openrisc/kernel/traps.c | 2 +- + arch/parisc/kernel/traps.c | 2 +- + arch/powerpc/kernel/traps.c | 8 +-- + arch/riscv/kernel/traps.c | 2 +- + arch/riscv/mm/fault.c | 2 +- + arch/s390/kernel/dumpstack.c | 2 +- + arch/s390/kernel/nmi.c | 2 +- + arch/sh/kernel/traps.c | 2 +- + arch/sparc/kernel/traps_32.c | 4 +- + arch/sparc/kernel/traps_64.c | 4 +- + arch/x86/entry/entry_32.S | 6 +- + arch/x86/entry/entry_64.S | 6 +- + arch/x86/kernel/dumpstack.c | 4 +- + arch/xtensa/kernel/traps.c | 2 +- + crypto/algboss.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_coex.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_main.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 2 +- + drivers/pnp/pnpbios/core.c | 6 +- + drivers/staging/rts5208/rtsx.c | 16 ++--- + drivers/usb/atm/usbatm.c | 2 +- + drivers/usb/gadget/function/f_mass_storage.c | 2 +- + fs/cifs/connect.c | 2 +- + fs/coredump.c | 20 +++--- + fs/exec.c | 12 ++-- + fs/io-wq.c | 6 +- + fs/io-wq.h | 2 +- + fs/jffs2/background.c | 2 +- + fs/nfs/callback.c | 4 +- + fs/nfs/nfs4state.c | 2 +- + fs/nfsd/nfssvc.c | 2 +- + fs/signalfd.c | 5 +- + include/linux/kernel.h | 1 - + include/linux/kthread.h | 4 +- + include/linux/module.h | 6 +- + include/linux/sched.h | 4 +- + include/linux/sched/signal.h | 25 ++----- + include/linux/sched/task.h | 1 + + kernel/exit.c | 100 ++++++++++++++------------- + kernel/fork.c | 16 ++--- + kernel/futex/core.c | 2 +- + kernel/kexec_core.c | 2 +- + kernel/kthread.c | 88 +++++++++++++++-------- + kernel/module.c | 6 +- + kernel/sched/core.c | 16 ++--- + kernel/signal.c | 71 +++++++++++-------- + lib/kunit/try-catch.c | 4 +- + mm/oom_kill.c | 2 +- + net/bluetooth/bnep/core.c | 2 +- + net/bluetooth/cmtp/core.c | 2 +- + net/bluetooth/hidp/core.c | 2 +- + tools/objtool/check.c | 8 ++- + 75 files changed, 302 insertions(+), 262 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-lockd-use-svc_set_num_threads-for-thread-.patch +Applying: fix up for "lockd: use svc_set_num_threads() for thread start and stop" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/lockd/svc.c +M include/linux/sunrpc/svc.h +$ git add -A . +$ git commit -v -a --amend +[master fb47dab3ad94] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git + Date: Wed Jan 5 14:58:12 2022 +1100 +$ git am -3 ../patches/0001-fix-up-for-vhost-use-user_worker-to-check-RLIMITs.patch +Applying: fix up for "vhost: use user_worker to check RLIMITs" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/vhost/vhost.c +$ git add -A . +$ git commit -v -a --amend +[master 304cae792823] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git + Date: Wed Jan 5 14:58:12 2022 +1100 +$ git am -3 ../patches/0001-fix-2-for-vhost-use-user_worker-to-check-RLIMITs.patch +Applying: fix 2 for "vhost: use user_worker to check RLIMITs" +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/exit.c +$ git add -A . +$ git commit -v -a --amend +[master aca3be9d4f27] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git + Date: Wed Jan 5 14:58:12 2022 +1100 +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (e89908201e25 selftests/vm: remove ARRAY_SIZE define from individual tests) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging tools/testing/selftests/net/gro.c +Merge made by the 'recursive' strategy. + tools/include/linux/kernel.h | 2 ++ + tools/testing/selftests/arm64/fp/vec-syscfg.c | 2 -- + tools/testing/selftests/cgroup/Makefile | 12 +++++++----- + tools/testing/selftests/cgroup/cgroup_util.h | 4 ++-- + tools/testing/selftests/clone3/clone3.c | 6 ++++++ + tools/testing/selftests/core/close_range_test.c | 4 ---- + tools/testing/selftests/ftrace/test.d/kprobe/profile.tc | 2 +- + tools/testing/selftests/ir/ir_loopback.c | 1 - + tools/testing/selftests/kselftest.h | 4 ++++ + tools/testing/selftests/kselftest_harness.h | 4 +++- + tools/testing/selftests/landlock/common.h | 4 ---- + tools/testing/selftests/lib.mk | 2 +- + tools/testing/selftests/mount/unprivileged-remount-test.c | 4 ++-- + .../move_mount_set_group/move_mount_set_group_test.c | 10 +++++----- + tools/testing/selftests/net/gro.c | 3 ++- + tools/testing/selftests/net/ipsec.c | 1 - + tools/testing/selftests/net/reuseport_bpf.c | 4 +--- + tools/testing/selftests/net/rxtimestamp.c | 2 +- + tools/testing/selftests/net/socket.c | 3 ++- + tools/testing/selftests/net/tcp_fastopen_backup_key.c | 6 ++---- + tools/testing/selftests/rseq/basic_percpu_ops_test.c | 3 +-- + tools/testing/selftests/rseq/rseq.c | 3 +-- + tools/testing/selftests/seccomp/seccomp_benchmark.c | 2 +- + tools/testing/selftests/sparc64/drivers/adi-test.c | 4 ---- + tools/testing/selftests/timens/procfs.c | 2 -- + tools/testing/selftests/timens/timens.c | 2 -- + tools/testing/selftests/timers/alarmtimer-suspend.c | 2 +- + tools/testing/selftests/timers/inconsistency-check.c | 2 +- + tools/testing/selftests/vm/mremap_test.c | 1 - + tools/testing/selftests/vm/pkey-helpers.h | 3 ++- + tools/testing/selftests/vm/va_128TBswitch.c | 2 +- + 31 files changed, 49 insertions(+), 57 deletions(-) +Merging livepatching/for-next (8cdf3792526a Merge branch 'for-5.17/fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'recursive' strategy. + Documentation/livepatch/api.rst | 30 ++++++++++++++++++++++++++++++ + Documentation/livepatch/index.rst | 1 + + Documentation/livepatch/shadow-vars.rst | 4 ++-- + Documentation/livepatch/system-state.rst | 4 ++-- + kernel/livepatch/core.c | 29 +++++++++++++---------------- + kernel/livepatch/shadow.c | 6 +++--- + 6 files changed, 51 insertions(+), 23 deletions(-) + create mode 100644 Documentation/livepatch/api.rst +Merging coresight/next (efa56eddf5d5 coresight: core: Fix typo in a comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging rtc/rtc-next (a12ac1f0ffa4 dt-bindings: rtc: qcom-pm8xxx-rtc: update register numbers) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/epson,rx8900.yaml | 1 + + .../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 9 +- + .../bindings/rtc/sunplus,sp7021-rtc.yaml | 56 +++ + MAINTAINERS | 7 + + arch/alpha/kernel/rtc.c | 7 +- + arch/powerpc/boot/dts/wii.dts | 5 + + arch/powerpc/configs/gamecube_defconfig | 2 +- + arch/powerpc/configs/wii_defconfig | 2 +- + arch/x86/kernel/hpet.c | 8 +- + drivers/base/power/trace.c | 6 +- + drivers/rtc/Kconfig | 24 ++ + drivers/rtc/Makefile | 2 + + drivers/rtc/dev.c | 6 +- + drivers/rtc/rtc-cmos.c | 201 +++++++---- + drivers/rtc/rtc-da9063.c | 16 +- + drivers/rtc/rtc-ftrtc010.c | 8 +- + drivers/rtc/rtc-gamecube.c | 377 +++++++++++++++++++++ + drivers/rtc/rtc-mc146818-lib.c | 182 ++++++---- + drivers/rtc/rtc-pcf2127.c | 2 +- + drivers/rtc/rtc-pcf85063.c | 97 ++++-- + drivers/rtc/rtc-pxa.c | 4 + + drivers/rtc/rtc-rs5c372.c | 185 +++++++++- + drivers/rtc/rtc-rv8803.c | 6 + + drivers/rtc/rtc-sunplus.c | 362 ++++++++++++++++++++ + include/linux/mc146818rtc.h | 4 + + 25 files changed, 1389 insertions(+), 190 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/sunplus,sp7021-rtc.yaml + create mode 100644 drivers/rtc/rtc-gamecube.c + create mode 100644 drivers/rtc/rtc-sunplus.c +Merging nvdimm/libnvdimm-for-next (9e05e95ca8da iomap: Fix error handling in iomap_zero_iter()) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Removing tools/testing/nvdimm/dax_pmem_core_test.c +Removing tools/testing/nvdimm/dax_pmem_compat_test.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_reflink.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/fuse/virtio_fs.c +Auto-merging fs/ext4/super.c +CONFLICT (content): Merge conflict in fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/erofs/super.c +Auto-merging fs/erofs/internal.h +Auto-merging fs/erofs/data.c +Auto-merging drivers/pci/p2pdma.c +Auto-merging drivers/md/dm.c +Removing drivers/dax/pmem/compat.c +Removing Documentation/ABI/obsolete/sysfs-class-dax +Resolved 'fs/ext4/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3dbaec791ebf] Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/obsolete/sysfs-class-dax | 22 --- + drivers/acpi/nfit/core.c | 4 +- + drivers/dax/Kconfig | 13 -- + drivers/dax/Makefile | 3 +- + drivers/dax/bus.c | 30 +-- + drivers/dax/bus.h | 13 -- + drivers/dax/device.c | 6 +- + drivers/dax/{pmem/core.c => pmem.c} | 36 +++- + drivers/dax/pmem/Makefile | 1 - + drivers/dax/pmem/compat.c | 72 -------- + drivers/dax/pmem/pmem.c | 30 --- + drivers/dax/super.c | 272 +++++++--------------------- + drivers/md/dm-linear.c | 63 ++----- + drivers/md/dm-log-writes.c | 110 ++--------- + drivers/md/dm-stripe.c | 75 ++------ + drivers/md/dm-table.c | 22 +-- + drivers/md/dm-writecache.c | 2 +- + drivers/md/dm.c | 89 ++------- + drivers/md/dm.h | 4 - + drivers/nvdimm/Kconfig | 2 +- + drivers/nvdimm/pmem.c | 38 ++-- + drivers/pci/p2pdma.c | 2 +- + drivers/s390/block/Kconfig | 2 +- + drivers/s390/block/dcssblk.c | 26 +-- + fs/Kconfig | 8 +- + fs/dax.c | 157 +++++++++------- + fs/erofs/data.c | 11 +- + fs/erofs/internal.h | 3 + + fs/erofs/super.c | 15 +- + fs/ext2/ext2.h | 1 + + fs/ext2/inode.c | 15 +- + fs/ext2/super.c | 16 +- + fs/ext4/ext4.h | 1 + + fs/ext4/inode.c | 25 ++- + fs/ext4/super.c | 11 +- + fs/fuse/Kconfig | 2 +- + fs/fuse/virtio_fs.c | 18 +- + fs/iomap/Makefile | 4 +- + fs/iomap/buffered-io.c | 39 ++-- + fs/xfs/libxfs/xfs_bmap.c | 4 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_bmap_util.c | 7 +- + fs/xfs/xfs_buf.c | 8 +- + fs/xfs/xfs_buf.h | 5 +- + fs/xfs/xfs_file.c | 3 +- + fs/xfs/xfs_iomap.c | 84 ++++++--- + fs/xfs/xfs_iomap.h | 12 +- + fs/xfs/xfs_iops.c | 7 +- + fs/xfs/xfs_pnfs.c | 4 +- + fs/xfs/xfs_reflink.c | 3 +- + fs/xfs/xfs_super.c | 80 ++++---- + include/linux/dax.h | 93 ++++------ + include/linux/device-mapper.h | 4 - + include/linux/iomap.h | 5 + + include/linux/memremap.h | 18 +- + include/linux/uio.h | 20 +- + mm/memremap.c | 59 ++---- + tools/testing/nvdimm/Kbuild | 8 +- + tools/testing/nvdimm/dax_pmem_compat_test.c | 8 - + tools/testing/nvdimm/dax_pmem_core_test.c | 8 - + tools/testing/nvdimm/test/iomap.c | 43 ++--- + tools/testing/nvdimm/test/ndtest.c | 4 - + tools/testing/nvdimm/test/nfit.c | 4 - + 63 files changed, 568 insertions(+), 1188 deletions(-) + delete mode 100644 Documentation/ABI/obsolete/sysfs-class-dax + rename drivers/dax/{pmem/core.c => pmem.c} (75%) + delete mode 100644 drivers/dax/pmem/compat.c + delete mode 100644 tools/testing/nvdimm/dax_pmem_compat_test.c + delete mode 100644 tools/testing/nvdimm/dax_pmem_core_test.c +Merging at24/at24/for-next (d08aea21c89d eeprom: at24: Add support for 24c1025 EEPROM) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/eeprom/at24.yaml | 29 ++++----- + drivers/misc/eeprom/at24.c | 68 ++++++++++------------ + 2 files changed, 47 insertions(+), 50 deletions(-) +Merging ntb/ntb-next (dee871b3979e ntb_hw_switchtec: Fix a minor issue in config_req_id_table()) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/ntb/msi.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 2 ++ + drivers/ntb/hw/idt/Makefile | 1 + + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 26 ++++++++++++-------------- + drivers/ntb/msi.c | 3 ++- + include/linux/switchtec.h | 2 -- + 5 files changed, 17 insertions(+), 17 deletions(-) +Merging seccomp/for-next/seccomp (1e6d69c7b9cd selftests/seccomp: Report event mismatches more clearly) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Merge made by the 'recursive' strategy. + tools/testing/selftests/seccomp/seccomp_bpf.c | 56 ++++++++++++++++++++++++--- + 1 file changed, 50 insertions(+), 6 deletions(-) +Merging kspp/for-next/kspp (136057256686 Linux 5.16-rc2) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Already up to date. +Merging kspp-gustavo/for-next/kspp (64bc5a949ae1 Merge branch 'for-linus/kspp' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 5 +++++ + arch/mips/mm/tlbex.c | 1 + + drivers/video/fbdev/sh7760fb.c | 2 ++ + 3 files changed, 8 insertions(+) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging gnss/gnss-next (547d2167c5c3 gnss: usb: add support for Sierra Wireless XM1210) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Merge made by the 'recursive' strategy. + drivers/gnss/Kconfig | 11 +++ + drivers/gnss/Makefile | 3 + + drivers/gnss/mtk.c | 2 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/gnss/ubx.c | 2 +- + drivers/gnss/usb.c | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 7 files changed, 232 insertions(+), 4 deletions(-) + create mode 100644 drivers/gnss/usb.c +Merging fsi/next (7cc2f34e1f4d fsi: sbefifo: Use interruptible mutex locking) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (779809c07324 dt-bindings: nvmem: Add missing 'reg' property) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'recursive' strategy. +Merging xarray/main (1c9f4b00b3cf XArray: Document the locking requirement for the xa_state) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) +Merging hyperv/hyperv-next (2deb55d9f57b swiotlb: Add CONFIG_HAS_IOMEM check around swiotlb_mem_remap()) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging drivers/net/hyperv/netvsc_drv.c +Auto-merging drivers/net/hyperv/netvsc.c +CONFLICT (content): Merge conflict in drivers/net/hyperv/netvsc.c +Auto-merging arch/x86/kernel/cc_platform.c +Resolved 'drivers/net/hyperv/netvsc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 25fc00fd46fd] Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/x86/hyperv/hv_init.c | 14 +++- + arch/x86/hyperv/ivm.c | 28 ++++++++ + arch/x86/include/asm/mshyperv.h | 2 +- + arch/x86/kernel/cc_platform.c | 8 +++ + arch/x86/kernel/cpu/mshyperv.c | 15 ++++- + drivers/hv/hv_common.c | 15 ++++- + drivers/hv/vmbus_drv.c | 4 ++ + drivers/net/hyperv/hyperv_net.h | 5 ++ + drivers/net/hyperv/netvsc.c | 136 +++++++++++++++++++++++++++++++++++++- + drivers/net/hyperv/netvsc_drv.c | 1 + + drivers/net/hyperv/rndis_filter.c | 2 + + drivers/scsi/storvsc_drv.c | 37 ++++++----- + include/asm-generic/mshyperv.h | 6 +- + include/linux/hyperv.h | 6 ++ + include/linux/swiotlb.h | 6 ++ + kernel/dma/swiotlb.c | 50 +++++++++++++- + 16 files changed, 307 insertions(+), 28 deletions(-) +Merging auxdisplay/auxdisplay (4daa9ff89ef2 auxdisplay: charlcd: checking for pointer reference before dereferencing) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (b77dbc86d604 kdb: Adopt scheduler's task classification) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging fpga/for-next (98ceca2f2932 fpga: region: fix kernel-doc) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga/for-next +Already up to date. +Merging kunit/test (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging cfi/cfi/next (baaf965f9430 mtd: hyperbus: rpc-if: fix bug in rpcif_hb_remove) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (ad659ccb5412 kunit: tool: Default --jobs to number of CPUs) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Auto-merging Documentation/dev-tools/kunit/start.rst +CONFLICT (content): Merge conflict in Documentation/dev-tools/kunit/start.rst +Auto-merging Documentation/dev-tools/kunit/index.rst +CONFLICT (content): Merge conflict in Documentation/dev-tools/kunit/index.rst +Resolved 'Documentation/dev-tools/kunit/index.rst' using previous resolution. +Resolved 'Documentation/dev-tools/kunit/start.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 53d793d53de2] Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git +$ git diff -M --stat --summary HEAD^.. + Documentation/dev-tools/kunit/api/index.rst | 3 +- + Documentation/dev-tools/kunit/api/test.rst | 3 +- + Documentation/dev-tools/kunit/start.rst | 9 +- + lib/kunit/test.c | 25 +-- + tools/testing/kunit/kunit.py | 182 ++++++++++++--------- + tools/testing/kunit/kunit_config.py | 61 +++---- + tools/testing/kunit/kunit_json.py | 8 +- + tools/testing/kunit/kunit_kernel.py | 76 ++++++--- + tools/testing/kunit/kunit_parser.py | 57 ++++--- + tools/testing/kunit/kunit_tool_test.py | 171 ++++++++++++++++--- + tools/testing/kunit/run_checks.py | 81 +++++++++ + .../test_is_test_passed-no_tests_no_plan.log | 7 + + 12 files changed, 480 insertions(+), 203 deletions(-) + create mode 100755 tools/testing/kunit/run_checks.py + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-no_tests_no_plan.log +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (00776ac534cc bus: mhi: pci_generic: Introduce Sierra EM919X support) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Auto-merging include/linux/mhi.h +Auto-merging drivers/bus/mhi/pci_generic.c +Auto-merging drivers/bus/mhi/core/pm.c +Merge made by the 'recursive' strategy. +Merging memblock/for-next (e888fa7bb882 memblock: Check memory add/cap ordering) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging rust/rust-next (075c05e2eb5d [RFC] drivers: android: Binder IPC in Rust) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +CONFLICT (modify/delete): tools/include/linux/lockdep.h deleted in HEAD and modified in rust/rust-next. Version rust/rust-next of tools/include/linux/lockdep.h left in tree. +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging samples/Kconfig +CONFLICT (content): Merge conflict in samples/Kconfig +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +Auto-merging kernel/livepatch/core.c +Auto-merging init/Kconfig +Auto-merging include/linux/spinlock.h +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/process/changes.rst +CONFLICT (content): Merge conflict in Documentation/process/changes.rst +Auto-merging Documentation/index.rst +Resolved 'Documentation/process/changes.rst' 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 rm -f tools/include/linux/lockdep.h +rm 'tools/include/linux/lockdep.h' +$ git commit --no-edit -v -a +[master 368bce87b479] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 4 + + Documentation/process/changes.rst | 13 + + Documentation/rust/arch-support.rst | 35 + + Documentation/rust/assets/favicon-16x16.png | Bin 0 -> 798 bytes + Documentation/rust/assets/favicon-32x32.png | Bin 0 -> 2076 bytes + Documentation/rust/assets/rust-logo.png | Bin 0 -> 53976 bytes + Documentation/rust/coding.rst | 91 + + Documentation/rust/docs.rst | 101 + + Documentation/rust/index.rst | 21 + + Documentation/rust/quick-start.rst | 212 ++ + MAINTAINERS | 14 + + Makefile | 146 +- + arch/arm/rust/target.json | 27 + + arch/arm64/rust/target.json | 34 + + arch/powerpc/rust/target.json | 29 + + arch/riscv/Makefile | 1 + + arch/riscv/rust/rv32ima.json | 36 + + arch/riscv/rust/rv32imac.json | 36 + + arch/riscv/rust/rv64ima.json | 36 + + arch/riscv/rust/rv64imac.json | 36 + + arch/x86/rust/target.json | 36 + + drivers/android/Kconfig | 7 + + drivers/android/Makefile | 2 + + drivers/android/allocation.rs | 266 +++ + drivers/android/context.rs | 79 + + drivers/android/defs.rs | 99 + + drivers/android/node.rs | 476 ++++ + drivers/android/process.rs | 964 ++++++++ + drivers/android/range_alloc.rs | 189 ++ + drivers/android/rust_binder.rs | 114 + + drivers/android/thread.rs | 871 +++++++ + drivers/android/transaction.rs | 326 +++ + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio_pl061_rust.rs | 362 +++ + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + include/uapi/linux/android/binder.h | 28 +- + init/Kconfig | 31 +- + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 5 +- + lib/Kconfig.debug | 144 ++ + lib/vsprintf.c | 12 + + rust/.gitignore | 7 + + rust/Makefile | 353 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 424 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 1844 +++++++++++++++ + rust/alloc/collections/mod.rs | 155 ++ + rust/alloc/fmt.rs | 583 +++++ + rust/alloc/lib.rs | 212 ++ + rust/alloc/macros.rs | 126 + + rust/alloc/raw_vec.rs | 612 +++++ + rust/alloc/slice.rs | 1275 ++++++++++ + rust/alloc/str.rs | 621 +++++ + rust/alloc/string.rs | 2857 +++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 158 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 356 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3327 +++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 172 ++ + rust/bindgen_parameters | 13 + + rust/build_error.rs | 29 + + rust/compiler_builtins.rs | 57 + + rust/exports.c | 16 + + rust/helpers.c | 436 ++++ + rust/kernel/allocator.rs | 65 + + rust/kernel/amba.rs | 276 +++ + rust/kernel/bindings.rs | 47 + + rust/kernel/bindings_helper.h | 30 + + rust/kernel/buffer.rs | 52 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 212 ++ + rust/kernel/cred.rs | 73 + + rust/kernel/device.rs | 206 ++ + rust/kernel/driver.rs | 198 ++ + rust/kernel/error.rs | 542 +++++ + rust/kernel/file.rs | 141 ++ + rust/kernel/file_operations.rs | 723 ++++++ + rust/kernel/gpio.rs | 475 ++++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 207 ++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/irq.rs | 408 ++++ + rust/kernel/lib.rs | 256 +++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 166 ++ + rust/kernel/module_param.rs | 497 ++++ + rust/kernel/of.rs | 101 + + rust/kernel/pages.rs | 162 ++ + rust/kernel/platdev.rs | 152 ++ + rust/kernel/power.rs | 118 + + rust/kernel/prelude.rs | 33 + + rust/kernel/print.rs | 441 ++++ + rust/kernel/random.rs | 50 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 562 +++++ + rust/kernel/revocable.rs | 163 ++ + rust/kernel/security.rs | 36 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/std_vendor.rs | 150 ++ + rust/kernel/str.rs | 375 +++ + rust/kernel/sync/arc.rs | 500 ++++ + rust/kernel/sync/condvar.rs | 137 ++ + rust/kernel/sync/guard.rs | 181 ++ + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 92 + + rust/kernel/sync/mutex.rs | 111 + + rust/kernel/sync/revocable_mutex.rs | 184 ++ + rust/kernel/sync/seqlock.rs | 201 ++ + rust/kernel/sync/spinlock.rs | 180 ++ + rust/kernel/sysctl.rs | 197 ++ + rust/kernel/task.rs | 182 ++ + rust/kernel/types.rs | 486 ++++ + rust/kernel/user_ptr.rs | 175 ++ + rust/macros/helpers.rs | 79 + + rust/macros/lib.rs | 94 + + rust/macros/module.rs | 622 +++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 113 + + samples/rust/Makefile | 12 + + samples/rust/rust_chrdev.rs | 50 + + samples/rust/rust_minimal.rs | 38 + + samples/rust/rust_miscdev.rs | 149 ++ + samples/rust/rust_module_parameters.rs | 72 + + samples/rust/rust_print.rs | 57 + + samples/rust/rust_random.rs | 61 + + samples/rust/rust_semaphore.rs | 174 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 40 + + samples/rust/rust_sync.rs | 81 + + scripts/Makefile.build | 22 + + scripts/Makefile.debug | 10 + + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/decode_stacktrace.sh | 14 + + scripts/generate_rust_analyzer.py | 133 ++ + scripts/is_rust_module.sh | 19 + + scripts/kallsyms.c | 40 +- + scripts/kconfig/confdata.c | 75 + + scripts/rust-version.sh | 31 + + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 155 files changed, 32368 insertions(+), 49 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/assets/favicon-16x16.png + create mode 100644 Documentation/rust/assets/favicon-32x32.png + create mode 100644 Documentation/rust/assets/rust-logo.png + create mode 100644 Documentation/rust/coding.rst + create mode 100644 Documentation/rust/docs.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 arch/arm/rust/target.json + create mode 100644 arch/arm64/rust/target.json + create mode 100644 arch/powerpc/rust/target.json + create mode 100644 arch/riscv/rust/rv32ima.json + create mode 100644 arch/riscv/rust/rv32imac.json + create mode 100644 arch/riscv/rust/rv64ima.json + create mode 100644 arch/riscv/rust/rv64imac.json + create mode 100644 arch/x86/rust/target.json + create mode 100644 drivers/android/allocation.rs + create mode 100644 drivers/android/context.rs + create mode 100644 drivers/android/defs.rs + create mode 100644 drivers/android/node.rs + create mode 100644 drivers/android/process.rs + create mode 100644 drivers/android/range_alloc.rs + create mode 100644 drivers/android/rust_binder.rs + create mode 100644 drivers/android/thread.rs + create mode 100644 drivers/android/transaction.rs + create mode 100644 drivers/gpio/gpio_pl061_rust.rs + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/fmt.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/macros.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/build_error.rs + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/amba.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/buffer.rs + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/cred.rs + create mode 100644 rust/kernel/device.rs + create mode 100644 rust/kernel/driver.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/file_operations.rs + create mode 100644 rust/kernel/gpio.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/io_mem.rs + create mode 100644 rust/kernel/iov_iter.rs + create mode 100644 rust/kernel/irq.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platdev.rs + create mode 100644 rust/kernel/power.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100644 rust/kernel/revocable.rs + create mode 100644 rust/kernel/security.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/std_vendor.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/kernel/sync/arc.rs + create mode 100644 rust/kernel/sync/condvar.rs + create mode 100644 rust/kernel/sync/guard.rs + create mode 100644 rust/kernel/sync/locked_by.rs + create mode 100644 rust/kernel/sync/mod.rs + create mode 100644 rust/kernel/sync/mutex.rs + create mode 100644 rust/kernel/sync/revocable_mutex.rs + create mode 100644 rust/kernel/sync/seqlock.rs + create mode 100644 rust/kernel/sync/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/macros/helpers.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100755 scripts/is_rust_module.sh + create mode 100755 scripts/rust-version.sh +Merging cxl/next (be185c2988b4 cxl/core: Remove cxld_const_init in cxl_decoder_alloc()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging include/linux/acpi.h +Auto-merging drivers/acpi/tables.c +Auto-merging drivers/acpi/numa/srat.c +Auto-merging drivers/acpi/Kconfig +Merge made by the 'recursive' strategy. + drivers/acpi/Kconfig | 3 + + drivers/acpi/numa/srat.c | 59 ++++++++++- + drivers/acpi/tables.c | 87 ++++++++++++---- + drivers/cxl/Kconfig | 1 + + drivers/cxl/acpi.c | 237 ++++++++++++++++-------------------------- + drivers/cxl/core/Makefile | 2 +- + drivers/cxl/core/bus.c | 26 +++-- + drivers/cxl/core/mbox.c | 186 ++++++++++++++++----------------- + drivers/cxl/core/memdev.c | 55 +++++----- + drivers/cxl/core/pmem.c | 20 ++-- + drivers/cxl/core/regs.c | 8 +- + drivers/cxl/cxl.h | 10 +- + drivers/cxl/cxlmem.h | 37 ++++--- + drivers/cxl/pci.c | 120 ++++++++++----------- + drivers/cxl/pmem.c | 85 ++++++++++----- + include/linux/acpi.h | 34 ++++-- + tools/testing/cxl/Kbuild | 3 +- + tools/testing/cxl/test/cxl.c | 68 ++++++++---- + tools/testing/cxl/test/mem.c | 99 +++++++++++++----- + tools/testing/cxl/test/mock.c | 30 ++---- + tools/testing/cxl/test/mock.h | 6 +- + 21 files changed, 675 insertions(+), 501 deletions(-) +Merging folio/for-next (b45608e6c6db mm: Use multi-index entries in the page cache) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging mm/filemap.c +CONFLICT (content): Merge conflict in mm/filemap.c +Auto-merging include/linux/uio.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/mm.h +Auto-merging fs/fs-writeback.c +Auto-merging fs/f2fs/f2fs.h +Resolved 'mm/filemap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 45372f987b46] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. + fs/f2fs/f2fs.h | 2 + + fs/fs-writeback.c | 24 +- + fs/remap_range.c | 116 +++-- + include/linux/huge_mm.h | 14 + + include/linux/mm.h | 68 +-- + include/linux/page-flags.h | 13 +- + include/linux/pagemap.h | 59 +-- + include/linux/pagevec.h | 67 ++- + include/linux/uio.h | 7 + + include/linux/xarray.h | 18 + + include/trace/events/filemap.h | 32 +- + lib/iov_iter.c | 30 +- + lib/xarray.c | 6 +- + mm/filemap.c | 1004 +++++++++++++++++++--------------------- + mm/folio-compat.c | 11 + + mm/huge_memory.c | 18 +- + mm/internal.h | 35 +- + mm/khugepaged.c | 12 +- + mm/memory.c | 27 +- + mm/migrate.c | 29 +- + mm/page-writeback.c | 6 +- + mm/readahead.c | 24 +- + mm/shmem.c | 177 +++---- + mm/swap.c | 26 +- + mm/truncate.c | 305 ++++++------ + 25 files changed, 1113 insertions(+), 1017 deletions(-) +Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Auto-merging include/linux/iomap.h +Auto-merging include/linux/bio.h +Auto-merging fs/xfs/xfs_icache.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/iomap/buffered-io.c +CONFLICT (content): Merge conflict in fs/iomap/buffered-io.c +Auto-merging fs/internal.h +Auto-merging block/bio.c +Auto-merging Documentation/core-api/kernel-api.rst +Resolved 'fs/iomap/buffered-io.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1bd895a750b6] Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/kernel-api.rst | 1 + + block/bio.c | 22 ++ + fs/buffer.c | 23 +- + fs/internal.h | 2 +- + fs/iomap/buffered-io.c | 518 ++++++++++++++++++---------------- + fs/xfs/xfs_aops.c | 24 +- + fs/xfs/xfs_icache.c | 2 + + include/linux/bio.h | 56 +++- + include/linux/iomap.h | 3 +- + 9 files changed, 373 insertions(+), 278 deletions(-) +Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string) +$ git merge -m Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git bitmap/bitmap-master-5.15 +Removing tools/include/asm-generic/bitops/find.h +Auto-merging mm/percpu.c +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig +Auto-merging kernel/time/clocksource.c +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/bitmap.h +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/f2fs/segment.c +Auto-merging drivers/tty/n_tty.c +Auto-merging drivers/soc/ti/k3-ringacc.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/pci/controller/dwc/pci-dra7xx.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/mmc/host/renesas_sdhi_core.c +Auto-merging drivers/media/cec/core/cec-core.c +Auto-merging drivers/infiniband/hw/irdma/hw.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +Auto-merging drivers/dma/ti/edma.c +CONFLICT (content): Merge conflict in drivers/dma/ti/edma.c +Auto-merging drivers/block/rnbd/rnbd-clt.c +Auto-merging block/blk-mq.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kvm/kvm-s390.c +CONFLICT (content): Merge conflict in arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/include/asm/bitops.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/include/asm/cputhreads.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/cputhreads.h +Auto-merging arch/powerpc/include/asm/bitops.h +Auto-merging arch/parisc/include/asm/bitops.h +CONFLICT (content): Merge conflict in arch/parisc/include/asm/bitops.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/include/asm/bitops.h +Auto-merging arch/csky/include/asm/bitops.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging MAINTAINERS +Resolved 'arch/parisc/include/asm/bitops.h' using previous resolution. +Resolved 'arch/powerpc/include/asm/cputhreads.h' using previous resolution. +Resolved 'arch/s390/kvm/kvm-s390.c' using previous resolution. +Resolved 'drivers/dma/ti/edma.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1a053299d826] Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 +- + arch/alpha/include/asm/bitops.h | 2 - + arch/arc/Kconfig | 1 - + arch/arc/include/asm/bitops.h | 1 - + arch/arm/include/asm/bitops.h | 1 - + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/bitops.h | 1 - + arch/csky/include/asm/bitops.h | 1 - + arch/h8300/include/asm/bitops.h | 1 - + arch/hexagon/include/asm/bitops.h | 1 - + arch/ia64/include/asm/bitops.h | 2 - + arch/m68k/include/asm/bitops.h | 2 - + arch/mips/Kconfig | 1 - + arch/mips/include/asm/bitops.h | 1 - + arch/openrisc/include/asm/bitops.h | 1 - + arch/parisc/include/asm/bitops.h | 1 - + arch/powerpc/include/asm/bitops.h | 2 - + arch/powerpc/platforms/pasemi/dma_lib.c | 4 +- + arch/riscv/include/asm/bitops.h | 1 - + arch/s390/Kconfig | 1 - + arch/s390/include/asm/bitops.h | 1 - + arch/s390/kvm/kvm-s390.c | 2 +- + arch/sh/include/asm/bitops.h | 1 - + arch/sparc/include/asm/bitops_32.h | 1 - + arch/sparc/include/asm/bitops_64.h | 2 - + arch/x86/Kconfig | 1 - + arch/x86/include/asm/bitops.h | 2 - + arch/x86/kernel/apic/vector.c | 4 +- + arch/x86/um/Kconfig | 1 - + arch/xtensa/include/asm/bitops.h | 1 - + block/blk-mq.c | 2 +- + drivers/block/rnbd/rnbd-clt.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 +- + drivers/hwmon/ltc2992.c | 3 +- + drivers/iio/adc/ad7124.c | 2 +- + drivers/infiniband/hw/irdma/hw.c | 16 +- + drivers/media/cec/core/cec-core.c | 2 +- + drivers/media/mc/mc-devnode.c | 2 +- + drivers/mmc/host/renesas_sdhi_core.c | 2 +- + drivers/net/virtio_net.c | 2 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 10 +- + drivers/soc/fsl/qbman/bman_portal.c | 2 +- + drivers/soc/fsl/qbman/qman_portal.c | 2 +- + drivers/soc/ti/k3-ringacc.c | 4 +- + drivers/tty/n_tty.c | 2 +- + drivers/virt/acrn/ioreq.c | 3 +- + fs/f2fs/segment.c | 8 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/ocfs2/dlm/dlmdomain.c | 4 +- + fs/ocfs2/dlm/dlmmaster.c | 18 +- + fs/ocfs2/dlm/dlmrecovery.c | 2 +- + fs/ocfs2/dlm/dlmthread.c | 2 +- + include/asm-generic/bitops.h | 1 - + include/asm-generic/bitops/le.h | 64 ---- + include/linux/bitmap.h | 34 +- + include/linux/bitops.h | 34 -- + include/linux/cpumask.h | 46 ++- + include/linux/find.h | 372 +++++++++++++++++++++ + kernel/time/clocksource.c | 4 +- + lib/Kconfig | 3 - + lib/find_bit.c | 21 ++ + lib/find_bit_benchmark.c | 21 ++ + lib/genalloc.c | 2 +- + lib/test_bitmap.c | 37 ++ + lib/vsprintf.c | 24 +- + mm/percpu.c | 35 +- + net/ncsi/ncsi-manage.c | 4 +- + tools/include/asm-generic/bitops.h | 1 - + tools/include/asm-generic/bitops/find.h | 145 -------- + tools/include/linux/bitmap.h | 7 +- + .../bitops => tools/include/linux}/find.h | 54 ++- + tools/lib/find_bit.c | 20 ++ + 73 files changed, 635 insertions(+), 438 deletions(-) + create mode 100644 include/linux/find.h + delete mode 100644 tools/include/asm-generic/bitops/find.h + rename {include/asm-generic/bitops => tools/include/linux}/find.h (83%) +Merging zstd/zstd-next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (21e42b00f779 efi/libstub: measure loaded initrd info into the TPM) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging include/linux/efi.h +Auto-merging arch/x86/platform/efi/efi_thunk_64.S +Auto-merging arch/x86/include/asm/efi.h +Auto-merging arch/x86/boot/compressed/efi_thunk_64.S +Merge made by the 'recursive' strategy. + arch/x86/boot/compressed/efi_thunk_64.S | 14 +++-- + arch/x86/include/asm/efi.h | 14 +++-- + arch/x86/platform/efi/efi_thunk_64.S | 14 ++++- + drivers/firmware/efi/libstub/efi-stub-helper.c | 73 +++++++++++++++++++++----- + drivers/firmware/efi/libstub/efi-stub.c | 10 +--- + drivers/firmware/efi/libstub/efistub.h | 30 ++++++++++- + drivers/firmware/efi/libstub/x86-stub.c | 26 ++++----- + include/linux/efi.h | 6 +-- + 8 files changed, 137 insertions(+), 50 deletions(-) +Merging unicode/for-next (e2a58d2d3416 unicode: only export internal symbols for the selftests) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Auto-merging fs/f2fs/sysfs.c +CONFLICT (content): Merge conflict in fs/f2fs/sysfs.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/ext4/super.c +Resolved 'fs/f2fs/sysfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bc60ba5d4529] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git +$ git diff -M --stat --summary HEAD^.. + fs/ext4/super.c | 39 ++- + fs/f2fs/super.c | 38 +-- + fs/f2fs/sysfs.c | 3 +- + fs/unicode/Kconfig | 13 +- + fs/unicode/Makefile | 13 +- + fs/unicode/mkutf8data.c | 24 +- + fs/unicode/utf8-core.c | 109 ++++----- + fs/unicode/utf8-norm.c | 262 +++------------------ + fs/unicode/utf8-selftest.c | 94 ++++---- + .../{utf8data.h_shipped => utf8data.c_shipped} | 22 +- + fs/unicode/utf8n.h | 81 +++---- + include/linux/unicode.h | 49 +++- + 12 files changed, 291 insertions(+), 456 deletions(-) + rename fs/unicode/{utf8data.h_shipped => utf8data.c_shipped} (99%) +Merging slab/for-next (08bc9290c7a3 mm/slob: Remove unnecessary page_mapcount_reset() function call) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Auto-merging mm/kfence/core.c +Auto-merging include/linux/slab.h +Auto-merging include/linux/mm.h +Merge made by the 'recursive' strategy. + arch/x86/mm/init_64.c | 2 +- + include/linux/bootmem_info.h | 2 +- + include/linux/kasan.h | 9 +- + include/linux/memcontrol.h | 48 -- + include/linux/mm.h | 12 + + include/linux/mm_types.h | 10 +- + include/linux/slab.h | 8 - + include/linux/slab_def.h | 16 +- + include/linux/slub_def.h | 29 +- + mm/bootmem_info.c | 7 +- + mm/kasan/common.c | 27 +- + mm/kasan/generic.c | 8 +- + mm/kasan/kasan.h | 1 + + mm/kasan/quarantine.c | 2 +- + mm/kasan/report.c | 13 +- + mm/kasan/report_tags.c | 10 +- + mm/kfence/core.c | 17 +- + mm/kfence/kfence_test.c | 6 +- + mm/memcontrol.c | 47 +- + mm/slab.c | 456 ++++++++-------- + mm/slab.h | 305 +++++++++-- + mm/slab_common.c | 14 +- + mm/slob.c | 62 +-- + mm/slub.c | 1177 +++++++++++++++++++++--------------------- + mm/sparse.c | 2 +- + mm/usercopy.c | 13 +- + mm/zsmalloc.c | 18 +- + 27 files changed, 1263 insertions(+), 1058 deletions(-) +Merging random/master (65d3efef42b4 random: don't reset crng_init_cnt on urandom_read()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging crypto/Kconfig +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/crypto/Makefile | 4 +- + arch/arm/crypto/blake2s-core.S | 8 +- + arch/arm/crypto/blake2s-glue.c | 73 +---------- + arch/arm/crypto/blake2s-shash.c | 75 ++++++++++++ + arch/x86/crypto/Makefile | 4 +- + arch/x86/crypto/blake2s-glue.c | 68 +---------- + arch/x86/crypto/blake2s-shash.c | 77 ++++++++++++ + arch/x86/kernel/cpu/mshyperv.c | 2 +- + crypto/Kconfig | 3 +- + drivers/char/random.c | 248 ++++++++++++++++++++------------------ + drivers/hv/vmbus_drv.c | 2 +- + drivers/net/Kconfig | 1 - + include/crypto/chacha.h | 15 ++- + include/crypto/internal/blake2s.h | 6 +- + include/linux/random.h | 2 +- + kernel/irq/chip.c | 4 +- + kernel/irq/handle.c | 11 +- + kernel/irq/internals.h | 2 +- + lib/crypto/Kconfig | 23 +--- + lib/crypto/Makefile | 9 +- + lib/crypto/blake2s-generic.c | 6 +- + lib/crypto/blake2s.c | 6 - + 23 files changed, 341 insertions(+), 309 deletions(-) + create mode 100644 arch/arm/crypto/blake2s-shash.c + create mode 100644 arch/x86/crypto/blake2s-shash.c +Merging landlock/next (2585cf9dfaad Linux 5.16-rc5) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging akpm-current/current (bd2b315ce5d7 ipc/sem: do not sleep with a spin lock held) +$ git merge --no-ff akpm-current/current +Auto-merging net/sunrpc/svc_xprt.c +Auto-merging mm/zsmalloc.c +CONFLICT (content): Merge conflict in mm/zsmalloc.c +Auto-merging mm/vmscan.c +Auto-merging mm/truncate.c +Auto-merging mm/swap.c +Auto-merging mm/slab_common.c +Auto-merging mm/slab.h +Auto-merging mm/shmem.c +Auto-merging mm/percpu.c +Auto-merging mm/oom_kill.c +Auto-merging mm/migrate.c +Auto-merging mm/memremap.c +CONFLICT (content): Merge conflict in mm/memremap.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +Auto-merging mm/khugepaged.c +Auto-merging mm/kasan/quarantine.c +Auto-merging mm/internal.h +Auto-merging mm/huge_memory.c +Auto-merging mm/Makefile +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/trace_osnoise.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/rcu/rcutorture.c +Auto-merging kernel/locking/spinlock_rt.c +Auto-merging kernel/kthread.c +CONFLICT (content): Merge conflict in kernel/kthread.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/kthread.h +CONFLICT (content): Merge conflict in include/linux/kthread.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/kasan.h +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/recovery.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/inode.c +Auto-merging fs/f2fs/gc.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/ext4/extents.c +Auto-merging fs/exec.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging drivers/of/fdt.c +Auto-merging drivers/infiniband/sw/rxe/rxe_qp.c +Auto-merging drivers/dax/device.c +Auto-merging drivers/dax/bus.h +Auto-merging drivers/dax/bus.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/um/kernel/trap.c +Auto-merging arch/s390/mm/fault.c +Auto-merging arch/riscv/mm/fault.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/mm/fault.c +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/mm/fault.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/mm/fault.c +Auto-merging arch/ia64/mm/fault.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/fault.c +Auto-merging arch/alpha/mm/fault.c +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'include/linux/kthread.h' using previous resolution. +Resolved 'kernel/kthread.c' using previous resolution. +Resolved 'mm/memremap.c' using previous resolution. +Resolved 'mm/zsmalloc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b45210ee319b] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/accounting/delay-accounting.rst | 55 ++- + Documentation/admin-guide/cgroup-v1/hugetlb.rst | 4 + + Documentation/admin-guide/cgroup-v2.rst | 11 + + Documentation/admin-guide/kernel-parameters.txt | 3 +- + Documentation/admin-guide/mm/damon/reclaim.rst | 25 + + Documentation/admin-guide/mm/damon/usage.rst | 225 +++++++-- + .../admin-guide/mm/numa_memory_policy.rst | 16 +- + Documentation/admin-guide/sysctl/kernel.rst | 2 + + Documentation/admin-guide/sysctl/vm.rst | 2 +- + Documentation/filesystems/proc.rst | 6 +- + Documentation/vm/arch_pgtable_helpers.rst | 6 +- + Documentation/vm/balance.rst | 2 +- + Documentation/vm/index.rst | 2 + + Documentation/vm/page_migration.rst | 12 +- + Documentation/vm/page_owner.rst | 29 +- + Documentation/vm/page_table_check.rst | 56 +++ + Documentation/vm/vmalloced-kernel-stacks.rst | 153 ++++++ + MAINTAINERS | 9 + + arch/Kconfig | 14 + + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/alpha/mm/fault.c | 16 +- + arch/arc/mm/fault.c | 3 +- + arch/arm/mm/fault.c | 2 +- + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/Kconfig | 21 +- + arch/arm64/include/asm/uaccess.h | 33 ++ + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/kernel/module.c | 4 +- + arch/arm64/mm/fault.c | 6 +- + arch/hexagon/mm/vm_fault.c | 8 +- + arch/ia64/Kconfig | 9 +- + arch/ia64/kernel/module.c | 6 +- + arch/ia64/kernel/setup.c | 5 +- + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/ia64/kernel/uncached.c | 2 +- + arch/ia64/mm/fault.c | 16 +- + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/mm/fault.c | 22 +- + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/mm/fault.c | 22 +- + arch/mips/Kconfig | 10 +- + 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/mips/mm/fault.c | 19 +- + arch/mips/mm/init.c | 14 +- + arch/nds32/mm/fault.c | 18 +- + arch/nios2/mm/fault.c | 18 +- + arch/openrisc/mm/fault.c | 18 +- + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/parisc/mm/fault.c | 18 +- + arch/powerpc/Kconfig | 17 +- + arch/powerpc/kernel/setup_64.c | 97 +--- + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/mm/fault.c | 6 +- + arch/riscv/Kconfig | 10 +- + arch/riscv/mm/fault.c | 2 +- + arch/s390/kernel/module.c | 5 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/mm/fault.c | 28 +- + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sh/mm/fault.c | 20 +- + arch/sparc/Kconfig | 12 +- + arch/sparc/kernel/led.c | 8 +- + arch/sparc/kernel/smp_64.c | 103 +--- + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/mm/fault_32.c | 16 +- + arch/sparc/mm/fault_64.c | 16 +- + arch/um/kernel/trap.c | 8 +- + arch/x86/Kconfig | 20 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/pgtable.h | 31 +- + arch/x86/kernel/module.c | 7 +- + arch/x86/kernel/setup_percpu.c | 66 +-- + arch/x86/mm/fault.c | 3 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + arch/xtensa/mm/fault.c | 17 +- + drivers/base/arch_numa.c | 68 +-- + drivers/block/zram/zram_drv.c | 11 +- + drivers/dax/bus.c | 32 ++ + drivers/dax/bus.h | 1 + + drivers/dax/device.c | 126 +++-- + drivers/infiniband/hw/qib/qib.h | 2 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 3 +- + drivers/infiniband/sw/siw/siw_main.c | 7 +- + drivers/iommu/tegra-smmu.c | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/xtlv.c | 2 + + drivers/of/fdt.c | 6 +- + fs/adfs/inode.c | 4 +- + fs/binfmt_elf.c | 29 +- + fs/btrfs/Kconfig | 3 +- + fs/btrfs/ioctl.c | 3 +- + fs/buffer.c | 56 ++- + fs/exec.c | 5 +- + fs/ext4/extents.c | 8 +- + fs/ext4/inline.c | 5 +- + fs/ext4/page-io.c | 9 +- + fs/f2fs/data.c | 4 +- + fs/f2fs/gc.c | 5 +- + fs/f2fs/inode.c | 4 +- + fs/f2fs/node.c | 4 +- + fs/f2fs/recovery.c | 6 +- + fs/f2fs/segment.c | 9 +- + fs/f2fs/super.c | 5 +- + fs/fat/file.c | 5 +- + fs/hfsplus/hfsplus_raw.h | 12 +- + fs/hfsplus/xattr.c | 4 +- + fs/hugetlbfs/inode.c | 7 +- + fs/inode.c | 49 ++ + fs/ioctl.c | 2 +- + fs/nilfs2/page.c | 4 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.c | 26 +- + fs/ocfs2/filecheck.c | 3 +- + fs/ocfs2/journal.c | 6 +- + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/proc/array.c | 3 + + fs/proc/base.c | 4 +- + fs/proc/fd.c | 23 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 13 +- + fs/proc/vmcore.c | 10 +- + fs/squashfs/super.c | 33 ++ + fs/userfaultfd.c | 8 +- + fs/xfs/kmem.c | 3 +- + fs/xfs/xfs_buf.c | 2 +- + include/kunit/assert.h | 2 +- + include/linux/ceph/libceph.h | 1 - + include/linux/damon.h | 89 ++-- + include/linux/delayacct.h | 107 +++-- + include/linux/elfcore-compat.h | 5 + + include/linux/elfcore.h | 5 + + include/linux/fs.h | 1 + + include/linux/gfp.h | 24 +- + include/linux/hash.h | 5 +- + include/linux/hugetlb.h | 10 +- + include/linux/hugetlb_cgroup.h | 7 + + include/linux/kasan.h | 4 +- + include/linux/kernel.h | 9 + + include/linux/kthread.h | 26 + + include/linux/list.h | 36 +- + include/linux/memcontrol.h | 22 + + include/linux/mempolicy.h | 6 +- + include/linux/memremap.h | 17 + + include/linux/mm.h | 78 +-- + include/linux/mm_inline.h | 136 ++++++ + include/linux/mm_types.h | 154 +++--- + include/linux/mmzone.h | 9 + + include/linux/page-flags.h | 96 +++- + include/linux/page_idle.h | 1 - + include/linux/page_table_check.h | 147 ++++++ + include/linux/pagemap.h | 1 + + include/linux/percpu.h | 13 +- + include/linux/pgtable.h | 8 + + include/linux/proc_fs.h | 12 +- + include/linux/rmap.h | 8 +- + include/linux/rwlock.h | 6 + + include/linux/rwlock_api_smp.h | 8 + + include/linux/rwlock_rt.h | 10 + + include/linux/sched.h | 17 +- + include/linux/sched/mm.h | 26 + + include/linux/spinlock_api_up.h | 1 + + include/linux/swap.h | 6 +- + include/linux/syscalls.h | 3 + + include/linux/uaccess.h | 21 + + include/linux/unaligned/packed_struct.h | 2 +- + include/linux/vm_event_item.h | 3 + + include/linux/vmalloc.h | 9 + + include/ras/ras_event.h | 2 - + include/trace/events/compaction.h | 24 +- + include/trace/events/damon.h | 15 +- + include/trace/events/error_report.h | 8 +- + include/trace/events/mmflags.h | 1 - + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/prctl.h | 3 + + include/uapi/linux/taskstats.h | 6 +- + include/uapi/linux/uuid.h | 10 +- + init/main.c | 25 +- + ipc/sem.c | 4 +- + kernel/configs/debug.config | 105 ++++ + kernel/delayacct.c | 49 +- + kernel/dma/pool.c | 4 +- + kernel/fork.c | 3 + + kernel/hung_task.c | 44 ++ + kernel/kthread.c | 33 +- + kernel/locking/spinlock.c | 10 + + kernel/locking/spinlock_rt.c | 12 + + kernel/panic.c | 32 +- + kernel/rcu/rcutorture.c | 7 +- + kernel/sys.c | 79 ++- + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 11 +- + kernel/trace/ring_buffer.c | 7 +- + kernel/trace/trace_hwlat.c | 6 +- + kernel/trace/trace_osnoise.c | 3 +- + lib/Kconfig.debug | 37 +- + lib/Kconfig.ubsan | 13 - + lib/Makefile | 3 +- + lib/kstrtox.c | 12 + + lib/list_debug.c | 8 +- + lib/lz4/lz4_decompress.c | 8 +- + lib/lz4/lz4defs.h | 2 + + lib/test_hash.c | 259 +++++----- + lib/test_hmm.c | 24 + + lib/test_kasan.c | 30 +- + lib/test_meminit.c | 1 + + lib/test_printf.c | 8 +- + lib/test_ubsan.c | 22 - + mm/Kconfig | 26 + + mm/Kconfig.debug | 24 + + mm/Makefile | 1 + + mm/compaction.c | 7 +- + mm/damon/core.c | 45 +- + mm/damon/dbgfs.c | 18 +- + mm/damon/paddr.c | 22 +- + mm/damon/prmtv-common.h | 4 - + mm/damon/reclaim.c | 46 ++ + mm/damon/vaddr.c | 182 +++++-- + mm/debug.c | 52 +- + mm/debug_vm_pgtable.c | 2 +- + mm/dmapool.c | 2 +- + mm/frontswap.c | 4 +- + mm/gup.c | 50 +- + mm/hmm.c | 5 +- + mm/huge_memory.c | 32 +- + mm/hugetlb.c | 6 +- + mm/hugetlb_cgroup.c | 133 +++++- + mm/hugetlb_vmemmap.c | 68 +-- + mm/internal.h | 7 +- + mm/kasan/quarantine.c | 11 + + mm/kasan/shadow.c | 9 +- + mm/khugepaged.c | 23 +- + mm/kmemleak.c | 21 +- + mm/ksm.c | 5 +- + mm/madvise.c | 494 ++++++++++++------- + mm/mapping_dirty_helpers.c | 1 + + mm/memcontrol.c | 46 +- + mm/memory-failure.c | 187 +++++--- + mm/memory.c | 16 +- + mm/memory_hotplug.c | 2 +- + mm/mempolicy.c | 107 ++++- + mm/memremap.c | 38 +- + mm/migrate.c | 377 ++++++++++----- + mm/mlock.c | 2 +- + mm/mmap.c | 55 ++- + mm/mmu_gather.c | 1 + + mm/mprotect.c | 2 +- + mm/oom_kill.c | 40 +- + mm/page_alloc.c | 213 ++++++--- + mm/page_counter.c | 1 - + mm/page_ext.c | 8 +- + mm/page_io.c | 3 + + mm/page_isolation.c | 2 +- + mm/page_owner.c | 4 +- + mm/page_table_check.c | 270 +++++++++++ + mm/percpu-internal.h | 18 + + mm/percpu-vm.c | 8 +- + mm/percpu.c | 164 +++++-- + mm/pgtable-generic.c | 1 + + mm/ptdump.c | 16 +- + mm/rmap.c | 70 ++- + mm/shmem.c | 91 +++- + mm/slab.h | 5 - + mm/slab_common.c | 34 +- + mm/sparse-vmemmap.c | 70 ++- + mm/swap.c | 2 +- + mm/swapfile.c | 44 +- + mm/truncate.c | 5 +- + mm/userfaultfd.c | 5 + + mm/util.c | 15 +- + mm/vmalloc.c | 84 +++- + mm/vmscan.c | 4 +- + mm/vmstat.c | 3 + + mm/zpool.c | 12 - + mm/zsmalloc.c | 529 ++++++++------------- + net/ceph/buffer.c | 4 +- + net/ceph/ceph_common.c | 27 -- + net/ceph/crypto.c | 2 +- + net/ceph/messenger.c | 2 +- + net/ceph/messenger_v2.c | 2 +- + net/ceph/osdmap.c | 12 +- + net/sunrpc/svc_xprt.c | 3 +- + samples/bpf/offwaketime_kern.c | 4 +- + samples/bpf/test_overhead_kprobe_kern.c | 11 +- + samples/bpf/test_overhead_tp_kern.c | 5 +- + scripts/Makefile.ubsan | 1 - + scripts/checkpatch.pl | 54 +-- + scripts/const_structs.checkpatch | 23 + + scripts/spelling.txt | 1 + + tools/accounting/getdelays.c | 8 +- + tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 4 +- + tools/include/linux/hash.h | 5 +- + tools/perf/builtin-kmem.c | 1 - + tools/testing/radix-tree/linux/gfp.h | 3 +- + .../selftests/bpf/progs/test_stacktrace_map.c | 6 +- + .../testing/selftests/bpf/progs/test_tracepoint.c | 6 +- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 1 + + tools/testing/selftests/vm/hmm-tests.c | 42 ++ + tools/testing/selftests/vm/hugepage-mremap.c | 46 +- + tools/testing/selftests/vm/hugepage-vmemmap.c | 144 ++++++ + tools/testing/selftests/vm/run_vmtests.sh | 13 +- + tools/testing/selftests/vm/userfaultfd.c | 16 +- + tools/vm/page_owner_sort.c | 216 +++++++-- + 311 files changed, 5816 insertions(+), 2983 deletions(-) + create mode 100644 Documentation/vm/page_table_check.rst + create mode 100644 Documentation/vm/vmalloced-kernel-stacks.rst + create mode 100644 include/linux/page_table_check.h + create mode 100644 kernel/configs/debug.config + create mode 100644 mm/page_table_check.c + create mode 100644 tools/testing/selftests/vm/hugepage-vmemmap.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/77)
Rebasing (2/77)
Rebasing (3/77)
Rebasing (4/77)
Rebasing (5/77)
Rebasing (6/77)
Rebasing (7/77)
Rebasing (8/77)
Rebasing (9/77)
Rebasing (10/77)
Rebasing (11/77)
Rebasing (12/77)
Rebasing (13/77)
Rebasing (14/77)
Rebasing (15/77)
Rebasing (16/77)
Rebasing (17/77)
Rebasing (18/77)
Rebasing (19/77)
Rebasing (20/77)
Rebasing (21/77)
Rebasing (22/77)
Rebasing (23/77)
Rebasing (24/77)
Rebasing (25/77)
Rebasing (26/77)
Rebasing (27/77)
Rebasing (28/77)
Rebasing (29/77)
Rebasing (30/77)
Rebasing (31/77)
Rebasing (32/77)
Rebasing (33/77)
Rebasing (34/77)
Rebasing (35/77)
Rebasing (36/77)
Rebasing (37/77)
Rebasing (38/77)
Rebasing (39/77)
Rebasing (40/77)
Rebasing (41/77)
Rebasing (42/77)
Rebasing (43/77)
Rebasing (44/77)
Rebasing (45/77)
Rebasing (46/77)
Rebasing (47/77)
Rebasing (48/77)
Rebasing (49/77)
Rebasing (50/77)
Rebasing (51/77)
Rebasing (52/77)
Rebasing (53/77)
Rebasing (54/77)
Rebasing (55/77)
Rebasing (56/77)
Rebasing (57/77)
Rebasing (58/77)
Rebasing (59/77)
Rebasing (60/77)
Rebasing (61/77)
Rebasing (62/77)
Rebasing (63/77)
Rebasing (64/77)
Rebasing (65/77)
Rebasing (66/77)
Rebasing (67/77)
Rebasing (68/77)
Rebasing (69/77)
Rebasing (70/77)
Rebasing (71/77)
Rebasing (72/77)
Rebasing (73/77)
Rebasing (74/77)
Rebasing (75/77)
Rebasing (76/77)
Rebasing (77/77)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 4fa38a68c28f...90211350337e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (90211350337e mm: hide the FRONTSWAP Kconfig symbol) +$ git merge --no-ff akpm/master +Removing mm/cleancache.c +Removing include/linux/cleancache.h +Removing Documentation/vm/cleancache.rst +Merge made by the 'recursive' strategy. + Documentation/vm/cleancache.rst | 296 --------- + Documentation/vm/frontswap.rst | 31 +- + Documentation/vm/index.rst | 1 - + MAINTAINERS | 7 - + arch/alpha/kernel/srm_env.c | 4 +- + arch/arm/configs/bcm2835_defconfig | 1 - + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/kernel/atags_proc.c | 2 +- + arch/arm/mm/alignment.c | 2 +- + arch/ia64/kernel/salinfo.c | 10 +- + arch/m68k/configs/amiga_defconfig | 1 - + arch/m68k/configs/apollo_defconfig | 1 - + arch/m68k/configs/atari_defconfig | 1 - + arch/m68k/configs/bvme6000_defconfig | 1 - + arch/m68k/configs/hp300_defconfig | 1 - + arch/m68k/configs/mac_defconfig | 1 - + arch/m68k/configs/multi_defconfig | 1 - + arch/m68k/configs/mvme147_defconfig | 1 - + arch/m68k/configs/mvme16x_defconfig | 1 - + arch/m68k/configs/q40_defconfig | 1 - + arch/m68k/configs/sun3_defconfig | 1 - + arch/m68k/configs/sun3x_defconfig | 1 - + arch/powerpc/kernel/proc_powerpc.c | 4 +- + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + arch/sh/mm/alignment.c | 4 +- + arch/xtensa/platforms/iss/simdisk.c | 4 +- + block/bdev.c | 5 - + drivers/acpi/proc.c | 2 +- + drivers/base/firmware_loader/fallback.c | 7 +- + drivers/base/firmware_loader/fallback.h | 11 + + drivers/base/firmware_loader/fallback_table.c | 25 +- + drivers/cdrom/cdrom.c | 23 +- + drivers/char/hpet.c | 22 +- + drivers/char/random.c | 14 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 1 + + drivers/gpu/drm/drm_mm.c | 4 + + drivers/gpu/drm/drm_modeset_lock.c | 9 + + drivers/gpu/drm/i915/i915_perf.c | 22 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 + + drivers/hwmon/dell-smm-hwmon.c | 4 +- + drivers/macintosh/mac_hid.c | 24 +- + drivers/net/bonding/bond_procfs.c | 8 +- + drivers/net/wireless/cisco/airo.c | 22 +- + drivers/net/wireless/intersil/hostap/hostap_ap.c | 16 +- + .../net/wireless/intersil/hostap/hostap_download.c | 2 +- + drivers/net/wireless/intersil/hostap/hostap_proc.c | 24 +- + drivers/net/wireless/ray_cs.c | 2 +- + drivers/nubus/proc.c | 36 +- + drivers/parisc/led.c | 4 +- + drivers/pci/proc.c | 10 +- + drivers/platform/x86/thinkpad_acpi.c | 4 +- + drivers/platform/x86/toshiba_acpi.c | 16 +- + drivers/pnp/isapnp/proc.c | 2 +- + drivers/pnp/pnpbios/proc.c | 4 +- + drivers/scsi/scsi_proc.c | 4 +- + drivers/scsi/sg.c | 35 +- + drivers/usb/gadget/function/rndis.c | 4 +- + drivers/zorro/proc.c | 2 +- + fs/Makefile | 2 + + fs/afs/proc.c | 6 +- + fs/aio.c | 31 +- + fs/binfmt_misc.c | 6 +- + fs/btrfs/extent_io.c | 10 - + fs/btrfs/super.c | 2 - + fs/coredump.c | 66 +- + fs/dcache.c | 37 +- + fs/eventpoll.c | 10 +- + fs/exec.c | 35 + + fs/ext4/mballoc.c | 14 +- + fs/ext4/readpage.c | 6 - + fs/ext4/super.c | 3 - + fs/f2fs/data.c | 14 - + fs/file_table.c | 47 +- + fs/inode.c | 39 +- + fs/jbd2/journal.c | 2 +- + fs/locks.c | 34 +- + fs/mpage.c | 7 - + fs/namei.c | 58 +- + fs/namespace.c | 24 +- + fs/notify/dnotify/dnotify.c | 21 +- + fs/notify/fanotify/fanotify_user.c | 10 +- + fs/notify/inotify/inotify_user.c | 11 +- + fs/ntfs3/ntfs_fs.h | 1 - + fs/ocfs2/stackglue.c | 25 +- + fs/ocfs2/super.c | 2 - + fs/pipe.c | 64 +- + fs/proc/generic.c | 6 - + fs/proc/inode.c | 1 + + fs/proc/internal.h | 5 - + fs/proc/proc_net.c | 8 +- + fs/proc/proc_sysctl.c | 63 +- + fs/super.c | 3 - + fs/sysctls.c | 39 ++ + include/linux/aio.h | 4 - + include/linux/cleancache.h | 124 ---- + include/linux/coredump.h | 10 +- + include/linux/dcache.h | 10 - + include/linux/dnotify.h | 1 - + include/linux/fanotify.h | 2 - + include/linux/frontswap.h | 35 +- + include/linux/fs.h | 18 - + include/linux/inotify.h | 3 - + include/linux/kprobes.h | 6 - + include/linux/migrate.h | 2 + + include/linux/mount.h | 3 - + include/linux/pipe_fs_i.h | 4 - + include/linux/poll.h | 2 - + include/linux/printk.h | 4 - + include/linux/proc_fs.h | 13 +- + include/linux/ref_tracker.h | 2 + + include/linux/sched/sysctl.h | 14 +- + include/linux/seq_file.h | 2 +- + include/linux/shmem_fs.h | 3 +- + include/linux/stackdepot.h | 25 +- + include/linux/stackleak.h | 5 - + include/linux/swapfile.h | 3 - + include/linux/sysctl.h | 67 +- + include/scsi/sg.h | 4 - + init/main.c | 9 +- + ipc/util.c | 2 +- + kernel/hung_task.c | 81 ++- + kernel/irq/proc.c | 8 +- + kernel/kprobes.c | 30 +- + kernel/printk/Makefile | 5 +- + kernel/printk/internal.h | 8 + + kernel/printk/printk.c | 4 +- + kernel/printk/sysctl.c | 85 +++ + kernel/resource.c | 4 +- + kernel/stackleak.c | 26 +- + kernel/sysctl.c | 724 ++------------------- + kernel/watchdog.c | 101 +++ + lib/Kconfig | 4 + + lib/Kconfig.kasan | 2 +- + lib/stackdepot.c | 46 +- + lib/test_sysctl.c | 22 +- + mm/Kconfig | 40 +- + mm/Makefile | 1 - + mm/cleancache.c | 315 --------- + mm/filemap.c | 102 ++- + mm/frontswap.c | 259 +------- + mm/kasan/common.c | 1 - + mm/migrate.c | 38 +- + mm/page_owner.c | 2 + + mm/shmem.c | 33 +- + mm/swapfile.c | 90 +-- + mm/truncate.c | 15 +- + mm/zswap.c | 8 +- + net/atm/proc.c | 4 +- + net/bluetooth/af_bluetooth.c | 8 +- + net/can/bcm.c | 2 +- + net/can/proc.c | 2 +- + net/core/neighbour.c | 6 +- + net/core/pktgen.c | 6 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 6 +- + net/ipv4/raw.c | 8 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/udp.c | 6 +- + net/netfilter/x_tables.c | 10 +- + net/netfilter/xt_hashlimit.c | 18 +- + net/netfilter/xt_recent.c | 4 +- + net/sunrpc/auth_gss/svcauth_gss.c | 4 +- + net/sunrpc/cache.c | 24 +- + net/sunrpc/stats.c | 2 +- + sound/core/info.c | 4 +- + 165 files changed, 1531 insertions(+), 2480 deletions(-) + delete mode 100644 Documentation/vm/cleancache.rst + create mode 100644 fs/sysctls.c + delete mode 100644 include/linux/cleancache.h + create mode 100644 kernel/printk/sysctl.c + delete mode 100644 mm/cleancache.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..bf1e5cbb1449 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220105 |