diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-02-10 18:45:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-02-10 18:45:23 +1100 |
| commit | 395a61741f7ea29e1f4a0d6e160197fe8e377572 (patch) | |
| tree | ad12f17d967c36412fc7b5b10939f5ff1b185b0d | |
| parent | 43a9443d5da2d53dc06095b90b1aca18b72caef5 (diff) | |
Add linux-next specific files for 20220210next-20220210
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 346 | ||||
| -rw-r--r-- | Next/Trees | 348 | ||||
| -rw-r--r-- | Next/merge.log | 8444 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 9139 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..5559dd72150c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,346 @@ +Name SHA1 +---- ---- +origin f4bc5bbb5fef3cf421ba3485d6d383c27ec473ed +fixes d06c942efea40e1701ade200477a7449008d9f24 +kbuild-current 1cf5f151d25fcca94689efd91afa0253621fb33a +arc-current f982d9b7c628388dae73b723cc2302cbd091cab5 +arm-current 9f80ccda53b9417236945bc7ece4b519037df74d +arm64-fixes da5fb9e1ad3fbf632dce735f1bdad257ca528499 +arm-soc-fixes 4a64f2d3527a0ae400bcea353898a8f47209b446 +drivers-memory-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +tee-fixes 7e3c6eb44c91f1ba0a92d6f327f60a552d4d36c8 +m68k-current 1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2 +powerpc-fixes 8defc2a5dd8f4c0cb19ecbaca8d3e89ab98524da +s390-fixes e286f231eab410793f3e91c924e6dbd23edee05a +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 3bed06e36994661a75bae6a289926e566b9b3c1a +bpf fe68195daf34d5dddacd3f93dd3eafc4beca3a0e +ipsec 6d0d95a1c2b07270870e7be16575c513c29af3f1 +netfilter 59085208e4a2183998964844f8684fea0378128d +ipvs 59085208e4a2183998964844f8684fea0378128d +wireless f0a6fd1527067da537e9c48390237488719948ed +rdma-fixes dfd42facf1e4ada021b939b4e19c935dcdd55566 +sound-current 52517d9c0c011272950e1d88f1ced297daa001e9 +sound-asoc-fixes e4e3a93c6e267572ca2345d8d86053e166843a8c +regmap-fixes b56a7cbf40c895cbe8b67ce5649a26b7a7bc48be +regulator-fixes 1aa6a795723024cbb7032c0f2d8fa12409fdf263 +spi-fixes 46c22c5279f77b31e108057adc369742d9bba8f4 +pci-current b139e263240928e877038c4d60527e96ed176d6b +driver-core.current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +tty.current 28cb138f559f8c1a1395f5564f86b8bbee83631b +usb.current 117b4e96c7f362eb6459543883fc07f77662472c +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 6ca0c6283340d819bf9c7d8e76be33c9fbd903ab +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy 9a8406ba1a9a2965c27e0db1d7753471d12ee9ff +staging.current 426aca16e903b387a0b0001d62207a745c67cfd3 +iio-fixes ea85bf906466191b58532bb19f4fbb4591f0a77e +char-misc.current bca828ccdd6548d24613d0cede04ada4dfb2f89c +soundwire-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +thunderbolt-fixes dfd42facf1e4ada021b939b4e19c935dcdd55566 +input-current 762f99f4f3cb41a775b5157dd761217beba65873 +crypto-current c6ce9c5831cae515d375a01b97ae1778689acf19 +vfio-fixes 8704e89349080bd640d1755c46d8cdc359a89748 +kselftest-fixes 183f80fd72db42c9cc483aa7a5e8e881355d0b03 +modules-fixes 2a987e65025e2b79c6d453b78cb5985ac6e5eb26 +dmaengine-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 36415a7964711822e63695ea67fede63979054d9 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes d40f0b133b44dc8ae2935d935add304496a19044 +reset-fixes 92c959bae2e54ba1e2540ba5f813f7752bd76be1 +mips-fixes d9565bf40da22426d2f660cb31700b6858d1911d +at91-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +omap-fixes 80d680fdccba214e8106dc1aa33de5207ad75394 +kvm-fixes 7e6a6b400db8048bd1c06e497e338388413cf5bc +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes bb9bb9c75482aa008cfc62b5cb88681de8408fa3 +nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 1af5bc8a7fbe7feaa562a78de5721c156e75ec30 +vfs-fixes 25f54d08f12feb593e62cc2193fedefaf7825301 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes e3d13da7f77d73c64981b62591c21614a6cf688f +samsung-krzk-fixes 442b0c08db7e35980bed6af091877f4dda72ffca +pinctrl-samsung-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +devicetree-fixes fa4300f060e5c4ca670b705f1e9b93685ad30c5b +scsi-fixes 5852ed2a6a39c862c8a3fdf646e1f4e01b91d710 +drm-fixes dfd42facf1e4ada021b939b4e19c935dcdd55566 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 4e6f55120c7eccf6f9323bb681632e23cbcb3f3c +mmc-fixes 54309fde1a352ad2674ebba004a79f7d20b9f037 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +hyperv-fixes ffc58bc4af9365d4eea72526bb3cf6a83615c673 +soc-fsl-fixes 8120bd469f5525da229953c1197f2b826c0109f4 +risc-v-fixes c3c94752087e789419be7024116c0a7b22883541 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +spdx e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +gpio-brgl-fixes c162ca0bcbfb39308c4dff4157e27c751af7032a +gpio-intel-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +pinctrl-intel-fixes 500c77eed0feabddd5b3afb48e32c204614a8eab +erofs-fixes 24331050a3e6afcd4451409831dd9ae8085a42f6 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 92a68053c3468705e2c7c752c9a3f256304a35a6 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes d7f55471db2719629f773c2d6b5742a69595bfd3 +cel-fixes c306d737691ef84305d4ed0d302c63db2932f0bb +irqchip-fixes 1d4df649cbb4b26d19bea38ecff4b65b10a1bbca +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current dfd42facf1e4ada021b939b4e19c935dcdd55566 +efi-fixes f5390cd0b43c2e54c7cf5506c7da4a37c5cef746 +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +drm-misc-fixes 9da1e9ab82c92d0e89fe44cad2cd7c2d18d64070 +kspp 9327f2939dc4692432a8b0c115edd9c1bf459f92 +kspp-gustavo c9e6606c7fe92b50a02ce51dda82586ebdf99b48 +kbuild c6553cd5dec6f8bd261349d59ce3f8270865b57b +perf e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 404f9373c4e5c943ed8a5e71c8dcfef9eddd54ab +asm-generic 733e417518a69b71061c3bafc2bf106109565eee +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm ed43eed0a6ace218a40a3f114673c6acc305ab7b +arm64 bb425a7598479fa0f171ec806033c440f218b0ce +arm-perf 602c873eb52e5717057eb0971258c8eb7440c4a5 +arm-soc 4a64f2d3527a0ae400bcea353898a8f47209b446 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 2c420d79dae47f9fa3bb8ccb76eaba864c579721 +aspeed a7e02e92755c4dcfbbf2ae217beef5e0e68db9eb +at91 9be3df0e718c07dcf5b34c6c1c8f96e774d1b392 +drivers-memory b7c3f95f32e0309a88ac1f9bb060ce6d5217e154 +imx-mxs afb77a29073eff31c93975a01c16bf7445686d7e +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 896f47a2c39c51a8d372f7a4007d0e2d96325a7b +mvebu fecc54c7ccfe5b8cef8b5a939dc3e4e7ea099bbb +omap 61b6b9cfada4262dad54a3153eb1e8ee0e087362 +qcom c924e8d6f4a4d64b8b2a2ae83344cd329a1e5860 +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas 65a3b7e5807616a88f3c6a25ce47cbc706676b63 +reset 89e7a6698fdd6d0cccf5bab11abc51f813944cd8 +rockchip 061b0332abfb483ed719b0650849f9f00cb233e4 +samsung-krzk e0995440d460e7523dcedfa2e82e7f3242ebf948 +scmi 5004c264ca645d0652f1941e6f1f04190470dc08 +stm32 59bb54bca1f57554157c6ba99fbc6c5fba42456e +sunxi d7ab185b353fa351e87c85b61e74c52b704a0253 +tee ce352be35ba0957af203567cd0d601a42010e84a +tegra 33e9d249ce3e937c4321f3c0c670fbc973089a81 +ti 3be5bf60d0554a8abdf541bb6e53db29dabcd8c4 +xilinx 3a14f0e614082821ef65de7e1fb39e74c2ee4ee3 +clk 28c7bbb2a3fc8358ac60f2d87ac43aac5489a062 +clk-imx 036a4b4b4dfa6c56806b71daf8589044ff7aeeaa +clk-renesas 9b90413c0524fc40eef1d63cd9dbaf9aa576038d +clk-samsung 45bd8166a1d821eb8fada3092514a7c8543f537c +csky a0793fdad9a11a32bc6d21317c93c83f4aa82ebc +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 469d56485c1bc9c2ccb4e150c42d18be58f0747c +m68knommu 021ff8547d2aeb596403258346307ca4484dac05 +microblaze fcc619621df50f63b641b18536f908b05d6782a4 +mips c47c7ab9b53635860c6b48736efdd22822d726d7 +nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 2719229eda8ea05ab10401b4fc7d236a8e3a5cc9 +parisc-hd 49c3c08b317d15a89c959c19ce02be19d9e4df1f +powerpc 29ec39fcf11e4583eb8d5174f756ea109c77cc44 +soc-fsl 1ce93cb102e7fcf5d1849044d23ce92b5a71040a +risc-v e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +s390 a086db89b45cf03f14672ab7db943c2d237f0bd7 +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml db0dd9cee82270e032123169ceff659eced5115d +xtensa 8a900dc390daecbfd0025bd4f12a11d2ed911fb7 +pidfd 317465bcc6f47088cd1152cf524c68dcdd37fb76 +fscrypt b7e072f9b77f4c516df96e0c22ec09f8b2e76ba1 +fscache dd81e1c7d5fb126e5fbc5c9e334d7b3ec29a16a0 +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs 80839488f2a7e275e6d2083919947209398171b0 +ceph 038b8d1d1ab1cce11a158d30bf080ff41a2cfd15 +cifs 0e91de9ca5c02e318738c1cdacac848f93cd89c1 +configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs dfd42facf1e4ada021b939b4e19c935dcdd55566 +exfat dd81e1c7d5fb126e5fbc5c9e334d7b3ec29a16a0 +ext3 ee12595147ac1fbfb5bcb23837e26dd58d94b15d +ext4 dfd42facf1e4ada021b939b4e19c935dcdd55566 +f2fs 728b9b5874f8adf3ea7163dd19ecc85109922e6a +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 073c3ab6ae0123601b5378e8f49c7b8ec4625f32 +gfs2 9421fdba42152c39ec9601ead423a4da0fdf7ada +jfs c48a14dca2cb57527dde6b960adbe69953935f10 +ksmbd 1a927cda94ac5e6783f243d4b3cd772b1c552ced +nfs dfd42facf1e4ada021b939b4e19c935dcdd55566 +nfs-anna b49ea673e119f59c71645e2f65b3ccad857c90ee +nfsd 8dfa08baad02584c9151d8de95c6b9df91a55458 +ntfs3 52e00ea6b26e45fb8159e3b57cdde8d3f9bdd8e9 +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs 94fd19752b28aa66c98e7991734af91dfc529f8f +ubifs aa39cc675799bc92da153af9a13d6f969c348e82 +v9fs 22e424feb6658c5d6789e45121830357809c59cb +xfs cea267c235e1b1ec3bfc415f6bd420289bcb3bc9 +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap ebb7fb1557b1d03b906b668aa2164b51e6b7d19a +djw-vfs 2d86293c70750e4331e9616aded33ab6b47c299d +file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1 +vfs 8f40da9494cf4dedee1cbbf168b1ce107d3a484d +printk 65c2c0709d8edaeadfb445625c7037c063c37d17 +pci e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +pstore a5d05b07961a2df47d3b4aae3bdae61ac095a43c +hid 2b3566c337c3140267364e446ee5f4e4e8b6ad7a +i2c b993fe2dc6b5b1b9a122f233207f5f13a7c96e5a +i3c 13462ba1815db5a96891293a9cfaa2451f7bd623 +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging b460ae6643ad52157cec964302dfcb61e7ed34d2 +jc_docs 869f496e1aa6d2b9a8653d65aa7040970f76627a +v4l-dvb 68a99f6a0ebfe9101ea79ba5af1c407a5ad4f629 +v4l-dvb-next 127efdbc51fe6064336c0452ce9c910b3e107cf0 +pm f2edd5978accce27c47f14e94f420b7fc5922266 +cpufreq-arm bc8b0c271bbf1e1a303087eb4b393cc0b791fc9d +cpupower 101025ff8e47d3c938ad2ae646a1794b9a8aa730 +devfreq 26291c54e111ff6ba87a164d85d4a4e134b7315c +opp 489a00ef46c93e85ed540d91836317cc469371ac +thermal 8ee1c0f6526ce942b7595951c7bb0165010051c2 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm feae43f8aa88309224b27bbe3a59fcb9aefab6f5 +rdma 0d9c00117b8a57a361b27f7bd94284c94155f039 +net-next c3e676b98326a419f30dd5d956c68fc33323f4fd +bpf-next 128dac5f21e950746aae3c1ef6df87e231d288a3 +ipsec-next 2ecda181682e9ed66dfbd5f8445c5d5a35b984d3 +mlx5-next cac3231cc6844075f0f7b6d19b11d78b2a3d76fc +netfilter-next c828414ac935bd3df96a8f7028d9d06a3db441e8 +ipvs-next c828414ac935bd3df96a8f7028d9d06a3db441e8 +bluetooth 4840aa67576b598093d2c6fea8987d065f717bca +wireless-next c761161851d31a6dc5274699cdf4e01de558cba9 +mtd ad5e35f58384179bbd3cdb349904e150f364c4f3 +nand 8cba323437a49a45756d661f500b324fc2d486fe +spi-nor e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +crypto 95e26b0391d085bbdbe1a82ffaaf2f92a3f71433 +drm 53dbee4926d3706ca9e03f3928fa85b5ec3bc0cc +drm-misc d3cbc6e323c9299d10c8d2e4127c77c7d05d07b1 +amdgpu e6cc5dc39ba484f25bbca87fbc1a7fcdd7343050 +drm-intel 98476876b837069e4582565fee63e70810c880b2 +drm-intel-gt bf8900406e9e5c928ba578c8fd932b4bc72556be +drm-tegra 22d7ee32f1fb6d51ef8cf657c6685ca04745755a +drm-msm 6aa89ae1fb049614b7e03e24485bbfb96754a02b +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv cdd156955f946beaa5f3a00d8ccf90e5a197becc +fbdev c5510f53140c8d7c1c924414cbd8cc600a95d874 +regmap 1056c41634d400cf88d30580dc53270030cb0ace +sound 69458e2c27800da7697c87ed908b65323ef3f3bd +sound-asoc 8be90641a0bbd9a3606547aa6a0f70b020e74c8f +modules a97ac8cb24a3c3ad74794adb83717ef1605d1b47 +input 994673dc66578be75bf32b6046c0d3df9e6dae1c +block 23a3fe5e6bb58304e662c604b86bc1264453e888 +device-mapper eaac0b590a47c717ef36cbfd1c528cd154c965a1 +libata 0c72a87889d6996a831642b8b77032e8efe07654 +pcmcia 3928cf08334ed895a31458cbebd8d4ec6d84c080 +mmc 7fd1f3ba20b72ac332648836798ff7206582077b +mfd 9cb74781a4365025a381a415e3c1d48095ce4eb8 +backlight ec961cf3241153e0f27d850f1bf0f172e7d27a21 +battery 784056d36f2779bce7e345285cfa1e097a9136bb +regulator e2a01b4e8806087743e5ee42f9dcedfc741d4112 +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor 364bd29902aead91b15e436a6a69221c800113c8 +integrity e27cd859ac8c94924b57427f7916e230042064b9 +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 70f4169ab421b277caf7429e84f468d8c47aa00a +smack e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +tomoyo f702e1107601230eec707739038a89018ea3468d +tpmdd a33f5c380c4bd3fa5278d690421b72052456d9fe +watchdog ffd264bd152cbf88fcf5ced04d3d380c77020231 +iommu 26291c54e111ff6ba87a164d85d4a4e134b7315c +audit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +devicetree b4ba994f2622b6a261a6b30933f32893d2d78294 +mailbox 869b6ca39c08c5b10eeb29d4b3c4bc433bf8ba5e +spi 2cbfa2128662c6b841f68cd2fe54df199457e38a +tip 163812a9c80a7323c40361e822c3c54be17fa38a +clockevents 7647204c2e81b28b4a7c4eec7d539f998d48eaf0 +edac 59d0e09374a3b2ebbe428a2b3f6a8816e2bc36db +irqchip c3da358f8ef1fce363fffdd20eaa7029b1677e45 +ftrace 6b9b6413700e104934734b72a3be622a76923b98 +rcu f589e15f9255f036c65af24163bb053f745567cc +kvm 17179d0068b20413de2355f84c75a93740257e20 +kvm-arm 00e6dae00e3dcb4dd54e1d62e295fd997a0cec28 +kvms390 812de04661c4daa7ac385c0dfd62594540538034 +xen-tip e25a8d959992f61b64a58fc62fb7951dc6f31d1f +percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20 +workqueues bc35f7ef96284b8c963991357a9278a6beafca54 +drivers-x86 34fc68348554d5b0f98def6cae9f252c3eb0c172 +chrome-platform ffebd90532728086007038986900426544e3df4e +hsi e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +leds d949edb503b13a0f05e5931d2340d9e4cfdef264 +ipmi d134ad2574a1c9b5c34659709769bdb25295fd25 +driver-core 27446562a1d9946a89231504a3c64eff2e7ca41d +usb c3c9cee592828528fd228b01d312c7526c584a42 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 26291c54e111ff6ba87a164d85d4a4e134b7315c +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty fcc446c8aa6303b247b0d88f460167b731265282 +char-misc 463713eb6164b6577f8e91447c7745628215531b +extcon 26291c54e111ff6ba87a164d85d4a4e134b7315c +gnss 26291c54e111ff6ba87a164d85d4a4e134b7315c +phy-next 1e805d190ba59e870a316c603f11e16de5a04131 +soundwire e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +thunderbolt 7f7b571becf3731dfa9aa50bed420e0c988e511d +vfio 2bed2ced40c97b8540ff38df0149e8ecb2bf4c65 +staging f2c461536226eb0852a241e72b9125685d6741b4 +iio 38ac2f038666521f94d4fa37b5a9441cef832ccf +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +icc 9d6c7ee7c4bb21e9ca61e4f73be1bdff658434cd +dmaengine e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +cgroup 48da2ddc4c785b908364be6e37eff1f55c189579 +scsi c8312098022ba821aafb0e54820dba3a511cb908 +scsi-mkp 62ed6622aaf0ba3c41cc6db6f901cbaa2a7378d1 +vhost fae0bd40fab0881169991942c5ab11c5464178c3 +rpmsg f5d4b6d998d403352d0143e0c158706412384121 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 4398693a9e24bcab0b99ea219073917991d0792b +gpio-intel a1ce76e89907a69713f729ff21db1efa00f3bb47 +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 003c30d8ad1cbfd52e50a75fd5b23832b72063db +pinctrl-intel 689e008877402564ce8a7884f21c9d2ed3ecb2dc +pinctrl-renesas 2e08ab0427fe3e33a92a37cfe3b6db340ab7397f +pinctrl-samsung 3652dc070bad335d6feb31402bb4ab1ad58d5cb6 +pwm 657e54e54ba5b3859848e0ea78d6384ebb7479d6 +userns f9d87929d451d3e649699d0f1d74f71f77ad38f5 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 6d468898d7744564ea9cb59d8de8f74660421599 +livepatching 32fdbc45ade0b5f9f99b6470fdd343659e1caa1e +coresight a4dabc3d30ea502fbd34319576f708174e328b72 +rtc e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +nvdimm 9e05e95ca8dae8de4a7a1645014e1bbd9c8a4dab +at24 e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +ntb afe1c85b354c6051761d80479262bd157cfc88f4 +seccomp 6cac51cea41630db3a13a887ea192d6c808de04c +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi 7cc2f34e1f4da07c791737cc6b3d965b31815ea0 +slimbus e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +nvmem 8043480a8cef1397c3659e3de635dd9ea92d087e +xarray 22f56b8e890d4e2835951b437bb6eeebfd1cb18b +hyperv 4ee524587105011ef43e5bd3ef5ed019715363dd +auxdisplay 4daa9ff89ef27be43c15995412d6aee393a78200 +kgdb b77dbc86d60459b42ab375e4e23172e7245f2854 +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +fpga 21f0a239ecab4b6765269af78904512358beb802 +kunit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +cfi baaf965f94308301d2dc554d72a87d7432cd5ce6 +kunit-next c2741453478badf571ef020d160053e8d5e1ba94 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi b2aa7904752da1f3d3015bd3dce97d3e502d3b02 +memblock 5b3408a4e5ff7609cc5b06da255b973ca0ab66d1 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +cxl be185c2988b48db65348d94168c793bdbc8d23c3 +folio 3abb28e275bfbe60136db37eae6679c3e1928cd5 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi 42f4046bc4ba56c6e4d2af7a9d7f70eaa563daec +unicode 5298d4bfe80f6ae6ae2777bcd1357b0022d98573 +slab 07f910f9b7295b6a28b337fedb56e612684c5659 +random a5a34bba133cbcdaa6d5bac4da64c5534c4a7975 +landlock a691b98583000247f9aef62d1190f49725ea2f0b +rust ced9f62ec4355bbb92226ac3f019da468a5c996b +akpm-current 9a3e4418488e1c1788e47bc759566b0cf69c1e6a +akpm 43a9443d5da2d53dc06095b90b1aca18b72caef5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..416a433d608d --- /dev/null +++ b/Next/Trees @@ -0,0 +1,348 @@ +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 git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#main +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 +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 +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.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 +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#main +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 +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-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 +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-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 +cisco git https://github.com/daniel-walker/cisco-linux.git#for-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 +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 +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 +rust git https://github.com/Rust-for-Linux/linux.git#rust-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..a9b508a0a4fb --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8444 @@ +$ date -R +Thu, 10 Feb 2022 08:32:00 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at e6251ab4551f Merge tag 'nfs-for-5.17-2' of git://git.linux-nfs.org/projects/anna/linux-nfs +Merging origin/master (f4bc5bbb5fef Merge tag 'nfsd-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating e6251ab4551f..f4bc5bbb5fef +Fast-forward (no commit created; -m option ignored) + arch/s390/kvm/kvm-s390.c | 2 + + crypto/algapi.c | 1 + + crypto/api.c | 1 - + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 3 +- + fs/binfmt_misc.c | 6 +-- + fs/file_table.c | 2 + + fs/nfsd/nfs3proc.c | 19 +++++--- + fs/nfsd/nfs3xdr.c | 4 +- + fs/nfsd/nfs4proc.c | 13 +++-- + fs/nfsd/nfs4xdr.c | 10 ++-- + fs/nfsd/trace.h | 14 +++--- + fs/nfsd/vfs.c | 57 +++++++++++++++------- + fs/nfsd/vfs.h | 4 +- + include/linux/nfs.h | 8 --- + 14 files changed, 82 insertions(+), 62 deletions(-) +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 (1cf5f151d25f Makefile.extrawarn: Move -Wunaligned-access to W=1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Merge made by the 'ort' strategy. + scripts/Makefile.extrawarn | 1 + + scripts/kconfig/preprocess.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging arc-current/for-curr (f982d9b7c628 arc: remove set_fs()) +$ 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 'ort' strategy. + arch/arc/Kconfig | 1 - + arch/arc/include/asm/segment.h | 20 ---------------- + arch/arc/include/asm/thread_info.h | 3 --- + arch/arc/include/asm/uaccess.h | 48 +++++++++++++++++++++++++------------- + 4 files changed, 32 insertions(+), 40 deletions(-) + delete mode 100644 arch/arc/include/asm/segment.h +Merging arm-current/fixes (9f80ccda53b9 ARM: 9180/1: Thumb2: align ALT_UP() sections in modules sufficiently) +$ 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 (da5fb9e1ad3f ACPI/IORT: Check node revision for PMCG resources) +$ 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 +Auto-merging arch/arm64/Kconfig +Merge made by the 'ort' strategy. + arch/arm64/Kconfig | 1 + + drivers/acpi/arm64/iort.c | 14 +++++++++++--- + 2 files changed, 12 insertions(+), 3 deletions(-) +Merging arm-soc-fixes/arm/fixes (4a64f2d3527a MAINTAINERS: add myself as a maintainer for the sl28cpld) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-driver-aspeed-uart-routing | 6 +- + .../devicetree/bindings/arm/omap/omap.txt | 3 + + MAINTAINERS | 34 +++++++- + 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/imx23-evk.dts | 1 - + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 5 +- + arch/arm/boot/dts/imx7ulp.dtsi | 2 +- + arch/arm/boot/dts/omap3-beagle-ab4.dts | 47 +++++++++++ + arch/arm/boot/dts/omap3-beagle.dts | 33 -------- + arch/arm/boot/dts/spear320-hmi.dts | 1 - + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 4 - + arch/arm/mach-omap2/display.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 4 +- + arch/arm/mach-socfpga/Kconfig | 2 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 ++ + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 8 -- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 ++ + .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 8 -- + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 4 + + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 12 +++ + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 10 +-- + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 2 +- + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 14 +++- + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 22 ------ + drivers/clocksource/timer-ti-dm-systimer.c | 2 +- + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 7 +- + drivers/soc/samsung/Kconfig | 2 +- + drivers/tee/optee/core.c | 1 + + drivers/tee/optee/ffa_abi.c | 92 +++++++++++++--------- + drivers/tee/optee/notif.c | 2 +- + drivers/tee/optee/optee_private.h | 5 +- + drivers/tee/optee/smc_abi.c | 58 ++++---------- + include/dt-bindings/clock/dra7.h | 14 ++-- + 39 files changed, 247 insertions(+), 207 deletions(-) + create mode 100644 arch/arm/boot/dts/omap3-beagle-ab4.dts +Merging drivers-memory-fixes/fixes (e783362eb54c Linux 5.17-rc1) +$ 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 +Already up to date. +Merging tee-fixes/fixes (7e3c6eb44c91 Merge tags 'optee-fixes-for-v5.17' and 'optee-fix-for-v5.17' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Auto-merging drivers/tee/optee/ffa_abi.c +Auto-merging drivers/tee/optee/smc_abi.c +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (1a0ae068bf6b m68k: defconfig: Update defconfigs for v5.16-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 (8defc2a5dd8f powerpc/64s/interrupt: Fix decrementer storm) +$ 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 (e286f231eab4 s390/module: fix building test_modules_helpers.o with clang) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 ++-- + arch/s390/lib/test_modules.c | 3 --- + arch/s390/lib/test_modules.h | 3 +++ + 3 files changed, 5 insertions(+), 5 deletions(-) +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 (3bed06e36994 Merge branch 'vlan-QinQ-leak-fix') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +- + drivers/net/bonding/bond_3ad.c | 3 +- + drivers/net/dsa/bcm_sf2.c | 7 ++- + drivers/net/dsa/lantiq_gswip.c | 14 +++-- + drivers/net/dsa/mt7530.c | 2 +- + drivers/net/dsa/mv88e6xxx/chip.c | 11 ++-- + drivers/net/dsa/ocelot/felix_vsc9959.c | 4 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 5 +- + drivers/net/dsa/qca/ar9331.c | 3 +- + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 3 ++ + drivers/net/ethernet/google/gve/gve_rx.c | 1 + + drivers/net/ethernet/ibm/ibmvnic.c | 13 +++-- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 13 ++--- + drivers/net/ethernet/litex/Kconfig | 2 +- + .../net/ethernet/microchip/sparx5/sparx5_ethtool.c | 2 +- + drivers/net/ethernet/mscc/ocelot.c | 8 +++ + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 12 +++-- + drivers/net/mdio/mdio-aspeed.c | 1 + + drivers/net/phy/marvell.c | 17 ++++--- + drivers/net/veth.c | 13 +++-- + include/net/dst_metadata.h | 14 ++++- + include/uapi/linux/netfilter/nf_conntrack_common.h | 2 +- + net/8021q/vlan.h | 2 +- + net/8021q/vlan_dev.c | 15 ++++-- + net/8021q/vlan_netlink.c | 7 +-- + net/ax25/af_ax25.c | 7 ++- + net/can/isotp.c | 29 ++++++++--- + net/dsa/dsa2.c | 25 +++------ + net/ipv4/ipmr.c | 2 + + net/ipv4/tcp.c | 33 +++++++----- + net/ipv6/ip6mr.c | 2 + + net/netfilter/nf_conntrack_netlink.c | 3 +- + net/netfilter/nf_conntrack_proto_sctp.c | 9 ++++ + net/netfilter/nf_conntrack_proto_tcp.c | 59 +++++++++++++++------- + net/netfilter/nft_exthdr.c | 2 +- + net/netfilter/nft_payload.c | 9 ++-- + net/smc/smc_pnet.c | 8 +-- + net/tipc/name_distr.c | 2 +- + 38 files changed, 242 insertions(+), 126 deletions(-) +Merging bpf/master (fe68195daf34 ixgbevf: Require large buffers for build_skb on 82599VF) +$ 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 (6d0d95a1c2b0 xfrm: fix the if_id check in changelink) +$ 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 'ort' strategy. + include/net/xfrm.h | 6 +++--- + net/ipv4/esp4.c | 2 +- + net/ipv6/esp6.c | 2 +- + net/ipv6/ip6_output.c | 11 +++++++---- + net/key/af_key.c | 2 +- + net/xfrm/xfrm_interface.c | 2 +- + net/xfrm/xfrm_policy.c | 14 ++++++++------ + net/xfrm/xfrm_state.c | 29 +++++++++++++---------------- + net/xfrm/xfrm_user.c | 6 +++++- + 9 files changed, 40 insertions(+), 34 deletions(-) +Merging netfilter/master (59085208e4a2 net: mscc: ocelot: fix all IP traffic getting trapped to CPU with PTP over IP) +$ 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 (59085208e4a2 net: mscc: ocelot: fix all IP traffic getting trapped to CPU with PTP over IP) +$ 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/main (f0a6fd152706 cfg80211: fix race in netlink owner interface destruction) +$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/main +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 13 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 6 +- + drivers/net/wireless/intel/iwlwifi/Kconfig | 13 -- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 11 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 5 - + drivers/net/wireless/intel/iwlwifi/fw/api/filter.h | 88 -------- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 1 - + drivers/net/wireless/intel/iwlwifi/fw/file.h | 2 - + drivers/net/wireless/intel/iwlwifi/fw/rs.c | 33 +-- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 3 +- + drivers/net/wireless/intel/iwlwifi/mei/main.c | 45 +++- + drivers/net/wireless/intel/iwlwifi/mei/net.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 203 ----------------- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 240 --------------------- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 1 - + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 3 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 3 +- + drivers/net/wireless/mac80211_hwsim.c | 13 ++ + net/mac80211/mlme.c | 29 ++- + net/wireless/core.c | 17 +- + 23 files changed, 114 insertions(+), 637 deletions(-) +Merging rdma-fixes/for-rc (dfd42facf1e4 Linux 5.17-rc3) +$ 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 (52517d9c0c01 Merge tag 'asoc-fix-v5.17-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (e4e3a93c6e26 MAINTAINERS: update cros_ec_codec maintainers) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/sound/google,cros-ec-codec.yaml | 1 + + MAINTAINERS | 1 + + drivers/soc/mediatek/mtk-scpsys.c | 15 +++----- + sound/soc/amd/acp/acp-mach.h | 1 - + sound/soc/amd/acp/acp-sof-mach.c | 4 +-- + sound/soc/codecs/rt5668.c | 12 ++++--- + sound/soc/codecs/rt5682.c | 12 ++++--- + sound/soc/codecs/rt5682s.c | 12 ++++--- + sound/soc/codecs/tas2770.c | 7 +++- + sound/soc/soc-ops.c | 41 ++++++++++++++++------ + 10 files changed, 66 insertions(+), 40 deletions(-) +Merging regmap-fixes/for-linus (b56a7cbf40c8 regmap: debugfs: Fix indentation) +$ 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. +Merging regulator-fixes/for-linus (1aa6a7957230 Merge remote-tracking branch 'regulator/for-5.16' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Auto-merging Documentation/devicetree/bindings/regulator/samsung,s5m8767.yaml +Auto-merging include/linux/regulator/driver.h +Merge made by the 'ort' strategy. + drivers/regulator/core.c | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) +Merging spi-fixes/for-linus (46c22c5279f7 Merge remote-tracking branch 'spi/for-5.16' 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 +Auto-merging drivers/spi/spi-uniphier.c +Merge made by the 'ort' strategy. + drivers/spi/spi-zynq-qspi.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging pci-current/for-linus (b139e2632409 Revert "PCI/portdrv: Do not setup up IRQs if there are no users") +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Merge made by the 'ort' strategy. + drivers/pci/pcie/portdrv_core.c | 47 +++++++++++++++-------------------------- + 1 file changed, 17 insertions(+), 30 deletions(-) +Merging driver-core.current/driver-core-linus (e783362eb54c Linux 5.17-rc1) +$ 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 (28cb138f559f vt_ioctl: add array_index_nospec to VT_ACTIVATE) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/n_tty.c | 4 ++-- + drivers/tty/serial/8250/8250_pericom.c | 2 +- + drivers/tty/vt/vt_ioctl.c | 3 ++- + 3 files changed, 5 insertions(+), 4 deletions(-) +Merging usb.current/usb-linus (117b4e96c7f3 usb: dwc3: gadget: Prevent core from processing stale TRBs) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/common/ulpi.c | 10 ++++-- + drivers/usb/dwc3/dwc3-xilinx.c | 2 +- + drivers/usb/dwc3/gadget.c | 13 ++++++++ + drivers/usb/gadget/function/f_fs.c | 56 +++++++++++++++++++++++++--------- + drivers/usb/gadget/function/f_uac2.c | 4 +-- + drivers/usb/gadget/legacy/raw_gadget.c | 2 +- + drivers/usb/gadget/udc/renesas_usb3.c | 2 ++ + drivers/usb/misc/usb251xb.c | 4 ++- + 8 files changed, 71 insertions(+), 22 deletions(-) +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 (6ca0c6283340 USB: serial: cp210x: add CPI Bulk Coin Recycler id) +$ 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 +Merge made by the 'ort' strategy. + drivers/usb/serial/ch341.c | 1 + + drivers/usb/serial/cp210x.c | 2 ++ + drivers/usb/serial/ftdi_sio.c | 3 +++ + drivers/usb/serial/ftdi_sio_ids.h | 3 +++ + drivers/usb/serial/option.c | 2 ++ + 5 files changed, 11 insertions(+) +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 6c870b7e6664] 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 (9a8406ba1a9a phy: dphy: Correct clk_pre parameter) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/bridge/nwl-dsi.c | 12 ++++---- + drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c | 3 +- + drivers/phy/broadcom/Kconfig | 3 +- + drivers/phy/broadcom/phy-brcm-usb.c | 38 ++++++++++++++++++++++++ + drivers/phy/cadence/phy-cadence-sierra.c | 35 +++++++++++++--------- + drivers/phy/mediatek/phy-mtk-tphy.c | 2 +- + drivers/phy/phy-core-mipi-dphy.c | 4 +-- + drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 3 +- + drivers/phy/st/phy-stm32-usbphyc.c | 2 +- + drivers/phy/ti/phy-j721e-wiz.c | 1 + + drivers/phy/xilinx/phy-zynqmp.c | 11 +++---- + 11 files changed, 80 insertions(+), 34 deletions(-) +Merging staging.current/staging-linus (426aca16e903 staging: fbtft: Fix error path in fbtft_driver_module_init()) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Merge made by the 'ort' strategy. + drivers/staging/fbtft/fbtft.h | 5 ++++- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 20 ++++++++++++++++++-- + 2 files changed, 22 insertions(+), 3 deletions(-) +Merging iio-fixes/fixes-togreg (ea85bf906466 iio: imu: st_lsm6dsx: wait for settling time in st_lsm6dsx_read_oneshot) +$ 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 'ort' strategy. + drivers/iio/accel/bmc150-accel-core.c | 5 ++++- + drivers/iio/accel/fxls8962af-core.c | 12 ++++++++++-- + drivers/iio/accel/fxls8962af-i2c.c | 2 +- + drivers/iio/accel/fxls8962af-spi.c | 2 +- + drivers/iio/accel/fxls8962af.h | 3 ++- + drivers/iio/accel/kxcjk-1013.c | 5 ++++- + drivers/iio/accel/mma9551.c | 5 ++++- + drivers/iio/accel/mma9553.c | 5 ++++- + drivers/iio/adc/ad7124.c | 2 +- + drivers/iio/adc/men_z188_adc.c | 9 ++++++++- + drivers/iio/adc/ti-tsc2046.c | 4 ++-- + drivers/iio/addac/ad74413r.c | 17 ++++++++--------- + drivers/iio/frequency/admv1013.c | 2 +- + drivers/iio/gyro/bmg160_core.c | 5 ++++- + drivers/iio/imu/adis16480.c | 7 ++++++- + drivers/iio/imu/kmx61.c | 5 ++++- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 6 +++++- + drivers/iio/magnetometer/bmc150_magn.c | 5 +++-- + 18 files changed, 72 insertions(+), 29 deletions(-) +Merging char-misc.current/char-misc-linus (bca828ccdd65 speakup-dectlk: Restore pitch setting) +$ 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 +Merge made by the 'ort' strategy. + drivers/accessibility/speakup/speakup_dectlk.c | 1 + + drivers/bus/mhi/pci_generic.c | 2 ++ + drivers/misc/eeprom/ee1004.c | 3 +++ + drivers/misc/fastrpc.c | 9 ++++++++- + 4 files changed, 14 insertions(+), 1 deletion(-) +Merging soundwire-fixes/fixes (e783362eb54c Linux 5.17-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 (dfd42facf1e4 Linux 5.17-rc3) +$ 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 (762f99f4f3cb Merge branch 'next' into for-linus) +$ 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 (c6ce9c5831ca crypto: api - Move cryptomgr soft dependency into algapi) +$ 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 (183f80fd72db selftests/ir: fix build with ancient kernel headers) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Merge made by the 'ort' strategy. + tools/testing/selftests/clone3/clone3.c | 2 -- + tools/testing/selftests/ir/ir_loopback.c | 10 ++++++++++ + tools/testing/selftests/pidfd/pidfd.h | 13 ++++++++++--- + tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 22 ++++++++++++++++++---- + tools/testing/selftests/pidfd/pidfd_test.c | 6 +++--- + tools/testing/selftests/pidfd/pidfd_wait.c | 5 ++--- + 6 files changed, 43 insertions(+), 15 deletions(-) +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 (e783362eb54c Linux 5.17-rc1) +$ 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 (36415a796471 mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/devices/phram.c | 12 ++++++---- + drivers/mtd/nand/raw/Kconfig | 3 ++- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 3 ++- + drivers/mtd/nand/raw/ingenic/ingenic_ecc.c | 7 +++++- + drivers/mtd/nand/raw/qcom_nandc.c | 14 +++++------- + drivers/mtd/parsers/qcomsmempart.c | 36 +++++++++++++++++++----------- + 7 files changed, 48 insertions(+), 29 deletions(-) +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 'ort' 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 +Already up to date. +Merging mips-fixes/mips-fixes (d9565bf40da2 MIPS: DTS: CI20: fix how ddc power is enabled) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Merge made by the 'ort' strategy. + arch/mips/boot/dts/ingenic/ci20.dts | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) +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 (7e6a6b400db8 Merge tag 'kvmarm-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ 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 (bb9bb9c75482 hwmon: (ntc_thermistor) Underscore Samsung thermistor) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/ntc_thermistor.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) +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 (1af5bc8a7fbe Merge branch 'misc-5.17' 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 +Merge made by the 'ort' strategy. + fs/btrfs/ioctl.c | 5 +++++ + fs/btrfs/send.c | 4 ++++ + fs/btrfs/transaction.c | 12 ++++++++++-- + 3 files changed, 19 insertions(+), 2 deletions(-) +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 (e3d13da7f77d platform/x86: asus-wmi: Fix regression when probing for fan curve control) +$ 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 +Merge made by the 'ort' strategy. + drivers/platform/x86/asus-wmi.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging samsung-krzk-fixes/fixes (442b0c08db7e soc: samsung: Fix typo in CONFIG_EXYNOS_USI description) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (e783362eb54c Linux 5.17-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 (fa4300f060e5 of: unittest: update text of expected warnings) +$ 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 'ort' strategy. + drivers/of/unittest.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) +Merging scsi-fixes/fixes (5852ed2a6a39 scsi: lpfc: Reduce log messages seen after firmware download) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/scsi/lpfc/lpfc.h | 13 ++++++++++--- + drivers/scsi/lpfc/lpfc_attr.c | 4 ++-- + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 8 +++++++- + 4 files changed, 20 insertions(+), 7 deletions(-) +Merging drm-fixes/drm-fixes (dfd42facf1e4 Linux 5.17-rc3) +$ 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 (4e6f55120c7e drm/i915: Workaround broken BIOS DBUF configuration on TGL/RKL) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_display.c | 1 + + drivers/gpu/drm/i915/display/intel_drrs.c | 8 ++ + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 14 ++- + drivers/gpu/drm/i915/i915_mm.h | 1 + + drivers/gpu/drm/i915/intel_pm.c | 143 ++++++++++++++++++++++----- + drivers/gpu/drm/i915/intel_pm.h | 1 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 4 +- + 7 files changed, 142 insertions(+), 30 deletions(-) +Merging mmc-fixes/fixes (54309fde1a35 mmc: block: fix read single on recovery logic) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/core/block.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) +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 'ort' strategy. +Merging gnss-fixes/gnss-linus (e783362eb54c Linux 5.17-rc1) +$ 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 (ffc58bc4af93 Drivers: hv: utils: Make use of the helper macro LIST_HEAD()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + drivers/hv/hv_utils_transport.c | 2 +- + drivers/hv/vmbus_drv.c | 9 ++++++--- + drivers/pci/controller/pci-hyperv.c | 13 +++++++++++-- + include/linux/hyperv.h | 1 + + 4 files changed, 19 insertions(+), 6 deletions(-) +Merging soc-fsl-fixes/fix (8120bd469f55 soc: fsl: dpaa2-console: free buffer before returning from dpaa2_console_read) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (c3c94752087e riscv: cpu-hotplug: clear cpu from numa map when teardown) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'ort' strategy. + arch/riscv/kernel/cpu-hotplug.c | 1 + + arch/riscv/kernel/head.S | 11 +++++------ + arch/riscv/kernel/stacktrace.c | 9 +++++---- + arch/riscv/mm/extable.c | 6 +++--- + arch/riscv/mm/init.c | 2 ++ + 5 files changed, 16 insertions(+), 13 deletions(-) +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 (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (c162ca0bcbfb gpio: sim: fix hogs with custom chip labels) +$ 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 'ort' strategy. + drivers/gpio/gpio-aggregator.c | 18 ++++++++++++++---- + drivers/gpio/gpio-sifive.c | 2 +- + drivers/gpio/gpio-sim.c | 19 +++++++++++++++---- + drivers/gpio/gpiolib-cdev.c | 6 +++--- + drivers/gpio/gpiolib-sysfs.c | 7 ++----- + drivers/gpio/gpiolib.h | 12 ++++++++++++ + 6 files changed, 47 insertions(+), 17 deletions(-) +Merging gpio-intel-fixes/fixes (e783362eb54c Linux 5.17-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 (500c77eed0fe pinctrl: zynqmp: Revert "Unify pin naming") +$ 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 (24331050a3e6 erofs: fix small compressed files inlining) +$ 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 (92a68053c346 Documentation: KUnit: Fix usage bug) +$ 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 +Merge made by the 'ort' strategy. + Documentation/dev-tools/kunit/usage.rst | 2 +- + tools/testing/kunit/run_checks.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mtd/ubi/build.c | 9 +- + drivers/mtd/ubi/fastmap.c | 28 ++++-- + drivers/mtd/ubi/vmt.c | 8 +- + fs/ubifs/dir.c | 235 ++++++++++++++++++++++++++++------------------ + fs/ubifs/file.c | 14 +-- + fs/ubifs/io.c | 34 ++++++- + fs/ubifs/ioctl.c | 2 +- + fs/ubifs/journal.c | 52 ++++++++-- + fs/ubifs/ubifs.h | 2 +- + 9 files changed, 246 insertions(+), 138 deletions(-) +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 (c306d737691e NFSD: Deprecate NFS_OFFSET_MAX) +$ 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 (1d4df649cbb4 irqchip/sifive-plic: Add missing thead,c900-plic match string) +$ 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 +Merge made by the 'ort' strategy. + .../interrupt-controller/sifive,plic-1.0.0.yaml | 21 +++++++++++++++------ + drivers/irqchip/irq-gic-v3-its.c | 3 +++ + drivers/irqchip/irq-sifive-plic.c | 1 + + 3 files changed, 19 insertions(+), 6 deletions(-) +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 (dfd42facf1e4 Linux 5.17-rc3) +$ 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 (f5390cd0b43c efi: runtime: avoid EFIv2 runtime services on Apple x86 machines) +$ 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 (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (9da1e9ab82c9 drm/rockchip: vop: Correct RK3399 VOP register fields) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 6 ++++++ + drivers/gpu/drm/drm_privacy_screen.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 1 + + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 +++++++------- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 8 +++++--- + drivers/gpu/drm/vc4/vc4_crtc.c | 1 - + drivers/gpu/drm/vc4/vc4_hdmi.c | 29 ++++++++++++++++++++--------- + drivers/gpu/drm/vc4/vc4_hdmi.h | 3 +++ + drivers/video/fbdev/core/fbcon.c | 7 +++---- + drivers/video/fbdev/core/fbmem.c | 2 ++ + 10 files changed, 48 insertions(+), 25 deletions(-) +Merging kspp/for-next/kspp (9327f2939dc4 Merge branch 'for-next/hardening' into for-next/kspp) +$ 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 +Auto-merging Makefile +Auto-merging drivers/iio/addac/ad74413r.c +Merge made by the 'ort' strategy. + Documentation/process/deprecated.rst | 20 +- + Makefile | 2 - + arch/alpha/mm/init.c | 6 +- + arch/m68k/include/asm/cmpxchg.h | 9 +- + arch/x86/Makefile | 3 - + arch/x86/boot/compressed/misc.c | 3 +- + arch/x86/kvm/emulate.c | 9 +- + arch/x86/kvm/kvm_emulate.h | 6 +- + arch/x86/lib/memcpy_32.c | 1 + + drivers/char/tpm/tpm_vtpm_proxy.c | 2 +- + drivers/gpu/drm/drm_dp_helper.c | 10 - + drivers/gpu/drm/tegra/dp.c | 11 +- + drivers/hwtracing/intel_th/msu.c | 4 +- + drivers/media/platform/omap3isp/ispstat.c | 5 +- + drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 6 +- + include/drm/drm_dp_helper.h | 4 +- + include/linux/compiler_attributes.h | 39 ++++ + include/linux/fortify-string.h | 238 +++++++++++++++++++----- + include/linux/overflow.h | 110 +++++++---- + include/uapi/linux/omap3isp.h | 21 ++- + lib/Makefile | 3 +- + lib/string_helpers.c | 6 + + lib/test_fortify/read_overflow2_field-memcpy.c | 5 + + lib/test_fortify/read_overflow2_field-memmove.c | 5 + + lib/test_fortify/write_overflow_field-memcpy.c | 5 + + lib/test_fortify/write_overflow_field-memmove.c | 5 + + lib/test_fortify/write_overflow_field-memset.c | 5 + + lib/test_overflow.c | 152 ++++++++++++--- + scripts/test_fortify.sh | 8 +- + security/Kconfig | 3 +- + 30 files changed, 531 insertions(+), 175 deletions(-) + create mode 100644 lib/test_fortify/read_overflow2_field-memcpy.c + create mode 100644 lib/test_fortify/read_overflow2_field-memmove.c + create mode 100644 lib/test_fortify/write_overflow_field-memcpy.c + create mode 100644 lib/test_fortify/write_overflow_field-memmove.c + create mode 100644 lib/test_fortify/write_overflow_field-memset.c +$ git am -3 ../patches/scsi_ibmvscsis_Silence_-Warray-bounds_warning.patch +Applying: scsi: ibmvscsis: Silence -Warray-bounds warning +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +M include/scsi/viosrp.h +$ git add -A . +$ git commit -v -a --amend +[master f6f1f85afaf2] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git + Date: Thu Feb 10 08:54:04 2022 +1100 +Merging kspp-gustavo/for-next/kspp (c9e6606c7fe9 Linux 5.16-rc8) +$ 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 +Already up to date. +Merging kbuild/for-next (c6553cd5dec6 usr/include/Makefile: add linux/nfc.h to the compile-test coverage) +$ 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 usr/include/Makefile +Merge made by the 'ort' strategy. +Merging perf/perf/core (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Already up to date. +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 (404f9373c4e5 swiotlb: simplify array allocation) +$ 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 'ort' strategy. + kernel/dma/swiotlb.c | 76 +++++++++++++++++----------------------------------- + 1 file changed, 24 insertions(+), 52 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 +Already up to date. +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 (ed43eed0a6ac 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 arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/boot/compressed/Makefile +Auto-merging arch/arm/kernel/traps.c +Auto-merging arch/arm/mm/ioremap.c +Auto-merging drivers/irqchip/irq-nvic.c +Resolved 'arch/arm/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a23bf2cb7039] Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 42 +++-- + arch/arm/Makefile | 9 + + arch/arm/boot/compressed/Makefile | 6 +- + arch/arm/boot/compressed/misc.c | 7 - + arch/arm/include/asm/assembler.h | 204 ++++++++++++++++---- + arch/arm/include/asm/current.h | 46 +++-- + 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 | 17 ++ + arch/arm/include/asm/irq.h | 1 - + arch/arm/include/asm/mach/arch.h | 2 - + arch/arm/include/asm/mmu.h | 2 +- + arch/arm/include/asm/mmu_context.h | 22 ++- + arch/arm/include/asm/page.h | 3 + + arch/arm/include/asm/percpu.h | 35 +++- + arch/arm/include/asm/smp.h | 5 - + arch/arm/include/asm/stacktrace.h | 12 ++ + arch/arm/include/asm/switch_to.h | 3 +- + arch/arm/include/asm/thread_info.h | 35 +--- + arch/arm/include/asm/tls.h | 31 ++- + arch/arm/include/asm/v7m.h | 3 +- + arch/arm/kernel/asm-offsets.c | 3 - + arch/arm/kernel/entry-armv.S | 208 +++++++++++++++++---- + arch/arm/kernel/entry-common.S | 16 +- + arch/arm/kernel/entry-header.S | 47 ++++- + arch/arm/kernel/entry-v7m.S | 39 ++-- + arch/arm/kernel/head-common.S | 4 +- + arch/arm/kernel/head.S | 7 + + arch/arm/kernel/irq.c | 61 ++++-- + arch/arm/kernel/module.c | 90 +++++++++ + arch/arm/kernel/process.c | 7 +- + arch/arm/kernel/setup.c | 8 +- + arch/arm/kernel/sleep.S | 13 ++ + arch/arm/kernel/smp.c | 11 +- + arch/arm/kernel/traps.c | 96 +++++++++- + 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/context.c | 3 +- + arch/arm/mm/ioremap.c | 18 +- + drivers/irqchip/Kconfig | 1 + + drivers/irqchip/irq-nvic.c | 22 +-- + 63 files changed, 1285 insertions(+), 751 deletions(-) + delete mode 100644 arch/arm/include/asm/entry-macro-multi.S + delete mode 100644 arch/arm/include/asm/hardware/entry-macro-iomd.S + 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 (bb425a759847 arm64: mm: apply __ro_after_init to memory_limit) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (602c873eb52e perf: Replace acpi_bus_get_device()) +$ 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 +Merge made by the 'ort' strategy. + drivers/perf/Kconfig | 2 +- + drivers/perf/arm-ccn.c | 10 ++++------ + drivers/perf/arm-cmn.c | 2 +- + drivers/perf/marvell_cn10k_tad_pmu.c | 2 ++ + drivers/perf/thunderx2_pmu.c | 6 ++---- + drivers/perf/xgene_pmu.c | 6 ++---- + 6 files changed, 12 insertions(+), 16 deletions(-) +Merging arm-soc/for-next (4a64f2d3527a MAINTAINERS: add myself as a maintainer for the sl28cpld) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +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 'ort' strategy. +Merging amlogic/for-next (2c420d79dae4 arm64: dts: meson-g12-common: add uart_ao_b pins muxing) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 11 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + arch/arm64/boot/dts/amlogic/Makefile | 6 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 43 +++ + .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 30 +++ + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 99 +++++++ + .../boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 129 +++++++++ + .../boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 108 ++++++++ + arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 300 +++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 145 ++++++++++ + .../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 133 +++++++++ + arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 112 ++++++++ + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 27 ++ + 13 files changed, 1147 insertions(+) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-s4.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts +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 'ort' strategy. + arch/arm/configs/aspeed_g5_defconfig | 7 ++++ + drivers/soc/aspeed/aspeed-socinfo.c | 73 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 80 insertions(+) +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 arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. +Merging drivers-memory/for-next (b7c3f95f32e0 Merge branch 'mem-ctrl-next' 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 +Merge made by the 'ort' strategy. + .../ddr/jedec,lpddr2-timings.yaml | 135 +++++++++++ + .../memory-controllers/ddr/jedec,lpddr2.yaml | 6 +- + .../ddr/jedec,lpddr3-timings.yaml | 157 ++++++++++++ + .../memory-controllers/ddr/jedec,lpddr3.yaml | 263 +++++++++++++++++++++ + .../memory-controllers/ddr/lpddr2-timings.txt | 52 ---- + .../memory-controllers/ddr/lpddr3-timings.txt | 58 ----- + .../bindings/memory-controllers/ddr/lpddr3.txt | 107 --------- + .../bindings/memory-controllers/fsl/fsl,ifc.yaml | 113 +++++++++ + .../bindings/memory-controllers/fsl/ifc.txt | 82 ------- + .../memory-controllers/mediatek,smi-common.yaml | 32 ++- + .../memory-controllers/mediatek,smi-larb.yaml | 19 +- + .../memory-controllers/samsung,exynos5422-dmc.yaml | 3 +- + drivers/memory/brcmstb_dpfe.c | 2 +- + drivers/memory/fsl_ifc.c | 9 + + drivers/memory/mtk-smi.c | 57 ++++- + drivers/memory/of_memory.c | 6 +- + 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 +++++++++- + 20 files changed, 887 insertions(+), 350 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr2-timings.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr3-timings.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr3.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/lpddr2-timings.txt + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/lpddr3-timings.txt + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/lpddr3.txt + 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 (afb77a29073e 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 1 + + arch/arm/boot/dts/imx28-tx28.dts | 2 +- + arch/arm/boot/dts/imx28.dtsi | 2 + + arch/arm/boot/dts/imx51-ts4800.dts | 2 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 2 +- + arch/arm/boot/dts/imx6q-tbs2910.dts | 2 +- + arch/arm/boot/dts/imx6qdl-dhcom-pdk2.dtsi | 3 + + arch/arm/boot/dts/imx6qdl-tx6-mb7.dtsi | 2 +- + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 74 ++ + arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts | 2 +- + arch/arm/boot/dts/imx7-colibri-aster.dtsi | 2 +- + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 2 +- + arch/arm/boot/dts/imxrt1050-pinfunc.h | 993 +++++++++++++++++++++ + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +- + arch/arm/configs/imxrt_defconfig | 35 + + arch/arm/mach-imx/Kconfig | 7 + + arch/arm/mach-imx/Makefile | 2 + + arch/arm/mach-imx/mach-imxrt.c | 19 + + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 24 + + arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi | 16 + + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 55 ++ + arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h | 1 + + arch/arm64/boot/dts/freescale/imx8mm-prt8mm.dts | 304 +++++++ + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 49 + + .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 78 ++ + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 78 ++ + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 59 ++ + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 89 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 46 +- + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 39 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 104 +++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 1 + + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 1 + + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 144 ++- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8qm-ss-lsio.dtsi | 8 + + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 15 +- + arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8qxp-ss-lsio.dtsi | 8 + + drivers/soc/imx/soc-imx.c | 3 - + 41 files changed, 2259 insertions(+), 27 deletions(-) + create mode 100644 arch/arm/boot/dts/imxrt1050-pinfunc.h + create mode 100644 arch/arm/configs/imxrt_defconfig + create mode 100644 arch/arm/mach-imx/mach-imxrt.c + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-prt8mm.dts +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 +Merge made by the 'ort' strategy. +Merging mediatek/for-next (896f47a2c39c Merge branch 'v5.17-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 +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/airoha.yaml | 28 +++++ + .../devicetree/bindings/arm/mediatek.yaml | 4 + + .../bindings/timer/mediatek,mtk-timer.txt | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../devicetree/bindings/watchdog/mtk-wdt.txt | 1 + + arch/arm/boot/dts/mt6582-prestigio-pmt5008-3g.dts | 43 +++++++ + arch/arm/boot/dts/mt6582.dtsi | 128 +++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 92 ++++++++------- + arch/arm64/configs/defconfig | 2 + + 9 files changed, 261 insertions(+), 40 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/airoha.yaml + create mode 100644 arch/arm/boot/dts/mt6582-prestigio-pmt5008-3g.dts + create mode 100644 arch/arm/boot/dts/mt6582.dtsi +Merging mvebu/for-next (fecc54c7ccfe Merge branch 'mvebu/arm' 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 +Merge made by the 'ort' strategy. + arch/arm/mach-dove/irq.c | 6 +++--- + arch/arm/mach-mv78xx0/irq.c | 3 +-- + arch/arm/mach-orion5x/irq.c | 2 +- + arch/arm/plat-orion/gpio.c | 8 ++------ + arch/arm/plat-orion/include/plat/orion-gpio.h | 3 +-- + arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 3 ++- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 ++-- + 7 files changed, 12 insertions(+), 17 deletions(-) +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 +Merge made by the 'ort' strategy. +Merging qcom/for-next (c924e8d6f4a4 Merge branches 'arm64-defconfig-for-5.18', 'arm64-for-5.18', 'drivers-for-5.18', 'dts-for-5.18', 'arm64-fixes-for-5.17' and 'dts-fixes-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 arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 7 +- + .../devicetree/bindings/phy/qcom,usb-hs-phy.txt | 1 + + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 16 + + arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 30 + + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 6 +- + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 3 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 19 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 +- + arch/arm/boot/dts/qcom-mdm9615.dtsi | 3 +- + arch/arm/boot/dts/qcom-msm8226.dtsi | 39 + + arch/arm/boot/dts/qcom-msm8660.dtsi | 3 +- + arch/arm/boot/dts/qcom-msm8960-cdp.dts | 2 +- + arch/arm/boot/dts/qcom-msm8960.dtsi | 30 +- + arch/arm/boot/dts/qcom-pm8226.dtsi | 43 + + arch/arm/boot/dts/qcom-sdx55.dtsi | 2 +- + arch/arm/mach-qcom/platsmp.c | 3 +- + arch/arm64/boot/dts/qcom/Makefile | 10 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 12 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 3 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 25 + + arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 6 +- + .../boot/dts/qcom/msm8992-lg-bullhead-rev-10.dts | 14 + + .../boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts | 14 + + ...llhead-rev-101.dts => msm8992-lg-bullhead.dtsi} | 2 - + ...v-101.dts => msm8994-huawei-angler-rev-101.dts} | 0 + arch/arm64/boot/dts/qcom/msm8994.dtsi | 7 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 14 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 56 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 10 + + arch/arm64/boot/dts/qcom/pms405.dtsi | 4 +- + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 16 + + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 16 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 124 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 + + arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 97 ++ + arch/arm64/boot/dts/qcom/sc7280-crd.dts | 12 + + .../dts/qcom/sc7280-herobrine-herobrine-r0.dts | 1352 ++++++++++++++++++++ + .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 313 +++++ + arch/arm64/boot/dts/qcom/sc7280-herobrine.dts | 14 - + arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 1103 ++++------------ + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 20 + + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 215 ++-- + arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 4 + + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 547 ++++++++ + arch/arm64/boot/dts/qcom/sc7280.dtsi | 577 +++++++-- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 3 - + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 19 +- + .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 12 + + arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 12 + + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 736 +++++++++++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 54 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 9 + + .../boot/dts/qcom/sm8150-microsoft-surface-duo.dts | 20 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 154 ++- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 132 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 48 +- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 405 ++++++ + arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 20 + + arch/arm64/boot/dts/qcom/sm8450.dtsi | 333 ++++- + arch/arm64/configs/defconfig | 11 + + drivers/cpuidle/cpuidle-qcom-spm.c | 28 +- + drivers/firmware/qcom_scm.c | 215 ++-- + drivers/firmware/qcom_scm.h | 7 + + drivers/remoteproc/qcom_q6v5_mss.c | 7 +- + drivers/remoteproc/qcom_q6v5_pas.c | 36 +- + drivers/soc/qcom/apr.c | 1 - + drivers/soc/qcom/llcc-qcom.c | 5 +- + drivers/soc/qcom/mdt_loader.c | 232 ++-- + drivers/soc/qcom/ocmem.c | 1 + + drivers/soc/qcom/qcom_aoss.c | 8 +- + drivers/soc/qcom/rpmpd.c | 3 + + include/linux/qcom_scm.h | 16 +- + include/linux/soc/qcom/mdt_loader.h | 17 +- + 76 files changed, 5843 insertions(+), 1509 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/msm8992-lg-bullhead-rev-10.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts + rename arch/arm64/boot/dts/qcom/{msm8992-bullhead-rev-101.dts => msm8992-lg-bullhead.dtsi} (98%) + rename arch/arm64/boot/dts/qcom/{msm8994-angler-rev-101.dts => msm8994-huawei-angler-rev-101.dts} (100%) + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8450-hdk.dts +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 'ort' strategy. + arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging renesas/next (65a3b7e58076 Merge branches 'renesas-arm-dt-for-v5.18' and 'renesas-drivers-for-v5.18' 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 +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 9 + + .../bindings/power/renesas,rzg2l-sysc.yaml | 7 +- + arch/arm/boot/dts/r9a06g032.dtsi | 11 + + arch/arm/configs/shmobile_defconfig | 4 + + arch/arm64/boot/dts/renesas/Makefile | 3 + + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 9 +- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 1 - + arch/arm64/boot/dts/renesas/gmsl-cameras.dtsi | 332 ++++++++++++++ + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 14 +- + .../boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 10 +- + .../boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 26 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 26 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 43 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 26 +- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 102 +++++ + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 191 ++++++++ + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 24 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 24 +- + .../boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi | 229 ++++++++++ + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 35 +- + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 70 +++ + arch/arm64/boot/dts/renesas/r9a07g044c1.dtsi | 32 ++ + arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts | 91 ++++ + arch/arm64/boot/dts/renesas/r9a07g044c2.dtsi | 20 + + arch/arm64/boot/dts/renesas/r9a07g044l2-smarc.dts | 2 + + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 491 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/r9a07g054l1.dtsi | 25 ++ + arch/arm64/boot/dts/renesas/r9a07g054l2-smarc.dts | 26 ++ + arch/arm64/boot/dts/renesas/r9a07g054l2.dtsi | 13 + + arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi | 207 +++++++++ + .../boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi | 137 ++++++ + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 2 +- + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 322 +------------- + .../boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi | 94 ++++ + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 208 +++++++++ + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 77 ++++ + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 139 +++++- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 20 +- + arch/arm64/configs/defconfig | 7 + + drivers/soc/renesas/Kconfig | 5 + + drivers/soc/renesas/renesas-soc.c | 68 ++- + include/dt-bindings/clock/r9a07g054-cpg.h | 229 ++++++++++ + 46 files changed, 2980 insertions(+), 443 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/gmsl-cameras.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c1.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g054.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g054l1.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g054l2-smarc.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g054l2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi + create mode 100644 include/dt-bindings/clock/r9a07g054-cpg.h +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 'ort' strategy. + .../bindings/reset/hisilicon,hi3660-reset.yaml | 5 ++ + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 4 +- + drivers/reset/reset-uniphier-glue.c | 75 ++++++++++------------ + 3 files changed, 42 insertions(+), 42 deletions(-) +Merging rockchip/for-next (061b0332abfb Merge branch 'v5.18-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 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 5 + + .../devicetree/bindings/soc/rockchip/grf.yaml | 1 + + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 5 + + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 17 +- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 20 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 133 +++++- + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 457 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 109 ++++- + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 118 +++++- + drivers/clk/rockchip/clk-rk3568.c | 14 +- + 16 files changed, 873 insertions(+), 24 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +Merging samsung-krzk/for-next (e0995440d460 Merge branch 'next/defconfig' 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 Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../bindings/arm/samsung/samsung-boards.yaml | 2 + + Documentation/devicetree/bindings/arm/tesla.yaml | 27 + + .../devicetree/bindings/clock/tesla,fsd-clock.yaml | 198 +++ + .../pinctrl/samsung,pinctrl-gpio-bank.yaml | 52 + + .../bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml | 81 + + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 106 ++ + .../bindings/pinctrl/samsung,pinctrl.yaml | 392 +++++ + .../bindings/pinctrl/samsung-pinctrl.txt | 383 ----- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 10 +- + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/exynos3250-artik5.dtsi | 10 +- + arch/arm/boot/dts/exynos3250-monk.dts | 2 +- + arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 165 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 4 +- + arch/arm/boot/dts/exynos4.dtsi | 6 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 30 +- + arch/arm/boot/dts/exynos4210-origen.dts | 2 +- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 226 +-- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 +- + arch/arm/boot/dts/exynos4210-trats.dts | 6 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 14 +- + arch/arm/boot/dts/exynos4210.dtsi | 2 - + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 4 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +- + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 30 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- + arch/arm/boot/dts/exynos4412-origen.dts | 4 +- + arch/arm/boot/dts/exynos4412-p4note.dtsi | 78 +- + arch/arm/boot/dts/exynos4412-pinctrl.dtsi | 252 +-- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 +- + arch/arm/boot/dts/exynos4412.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 7 +- + arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 222 +-- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 7 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 27 +- + arch/arm/boot/dts/exynos5250-snow-rev5.dts | 2 +- + arch/arm/boot/dts/exynos5250-snow.dts | 2 +- + arch/arm/boot/dts/exynos5250-spring.dts | 25 +- + arch/arm/boot/dts/exynos5250.dtsi | 19 +- + arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 148 +- + arch/arm/boot/dts/exynos5260-xyref5260.dts | 23 +- + arch/arm/boot/dts/exynos5260.dtsi | 128 ++ + arch/arm/boot/dts/exynos5410-odroidxu.dts | 34 +- + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 170 +- + arch/arm/boot/dts/exynos5410-smdk5410.dts | 27 +- + arch/arm/boot/dts/exynos5410.dtsi | 4 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 12 +- + arch/arm/boot/dts/exynos5420-chagall-wifi.dts | 75 + + .../arm/boot/dts/exynos5420-galaxy-tab-common.dtsi | 691 ++++++++ + arch/arm/boot/dts/exynos5420-klimt-wifi.dts | 75 + + arch/arm/boot/dts/exynos5420-peach-pit.dts | 99 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 194 +-- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 16 +- + arch/arm/boot/dts/exynos5420.dtsi | 10 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 4 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 6 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 99 +- + arch/arm/boot/dts/s3c2416-pinctrl.dtsi | 60 +- + arch/arm/boot/dts/s3c6410-mini6410.dts | 4 +- + arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 210 +-- + arch/arm/boot/dts/s3c64xx.dtsi | 16 +- + arch/arm/boot/dts/s5pv210-aquila.dts | 2 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 40 +- + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 12 +- + arch/arm/boot/dts/s5pv210-galaxys.dts | 16 +- + arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 226 +-- + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-exynos/firmware.c | 4 +- + arch/arm64/Kconfig.platforms | 6 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/exynos/Makefile | 1 + + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 211 +-- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 276 +-- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 7 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 11 +- + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 176 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 44 +- + arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 195 +++ + arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi | 663 +++++++ + arch/arm64/boot/dts/exynos/exynos850.dtsi | 741 ++++++++ + .../boot/dts/exynos/exynosautov9-pinctrl.dtsi | 50 +- + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 2 +- + arch/arm64/boot/dts/tesla/Makefile | 3 + + arch/arm64/boot/dts/tesla/fsd-evb.dts | 39 + + arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 335 ++++ + arch/arm64/boot/dts/tesla/fsd.dtsi | 731 ++++++++ + arch/arm64/configs/defconfig | 1 + + drivers/clk/samsung/Kconfig | 9 + + drivers/clk/samsung/Makefile | 1 + + drivers/clk/samsung/clk-fsd.c | 1803 ++++++++++++++++++++ + drivers/clk/samsung/clk-pll.c | 1 + + drivers/clk/samsung/clk-pll.h | 1 + + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 2 - + drivers/pinctrl/samsung/pinctrl-exynos.c | 4 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 87 +- + include/dt-bindings/clock/fsd-clk.h | 150 ++ + 101 files changed, 8345 insertions(+), 2040 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/tesla.yaml + create mode 100644 Documentation/devicetree/bindings/clock/tesla,fsd-clock.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-gpio-bank.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-wakeup-interrupt.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung,pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt + create mode 100644 arch/arm/boot/dts/exynos5420-chagall-wifi.dts + create mode 100644 arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi + create mode 100644 arch/arm/boot/dts/exynos5420-klimt-wifi.dts + 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 + create mode 100644 arch/arm64/boot/dts/tesla/Makefile + create mode 100644 arch/arm64/boot/dts/tesla/fsd-evb.dts + create mode 100644 arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/tesla/fsd.dtsi + create mode 100644 drivers/clk/samsung/clk-fsd.c + create mode 100644 include/dt-bindings/clock/fsd-clk.h +Merging scmi/for-linux-next (5004c264ca64 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 'ort' strategy. + .../devicetree/bindings/firmware/arm,scmi.yaml | 65 +++ + arch/arm64/boot/dts/arm/juno-base.dtsi | 3 +- + drivers/firmware/arm_scmi/Kconfig | 41 ++ + drivers/firmware/arm_scmi/Makefile | 8 + + 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 | 22 +- + include/linux/scmi_protocol.h | 8 + + include/trace/events/scmi.h | 28 + + 12 files changed, 994 insertions(+), 82 deletions(-) + create mode 100644 drivers/firmware/arm_scmi/optee.c +Merging stm32/stm32-next (59bb54bca1f5 ARM: dts: stm32: use exti 19 as main interrupt to support RTC wakeup on stm32mp157) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/stm32/stm32.yaml | 6 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/stm32429i-eval.dts | 12 + + arch/arm/boot/dts/stm32f429-disco.dts | 12 + + arch/arm/boot/dts/stm32f429.dtsi | 57 +-- + arch/arm/boot/dts/stm32f469-disco.dts | 16 + + arch/arm/boot/dts/stm32mp13-pinctrl.dtsi | 81 ++- + arch/arm/boot/dts/stm32mp131.dtsi | 74 ++- + arch/arm/boot/dts/stm32mp135f-dk.dts | 7 +- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 143 +++++- + arch/arm/boot/dts/stm32mp151.dtsi | 8 +- + arch/arm/boot/dts/stm32mp157c-emsbc-argon.dts | 53 ++ + arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 552 +++++++++++++++++++++ + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 23 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 56 +++ + 15 files changed, 1027 insertions(+), 74 deletions(-) + create mode 100644 arch/arm/boot/dts/stm32mp157c-emsbc-argon.dts + create mode 100644 arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi +Merging sunxi/sunxi/for-next (d7ab185b353f Merge branch 'sunxi/dt-for-5.18' 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 arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun7i-a20-haoyu-marsboard.dts | 182 +++++++++++++++++++++++ + arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 28 ++++ + arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 4 + + arch/arm/boot/dts/sun8i-h3.dtsi | 2 +- + arch/arm/boot/dts/sun8i-v3s.dtsi | 22 +-- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 18 +++ + 8 files changed, 250 insertions(+), 12 deletions(-) + create mode 100644 arch/arm/boot/dts/sun7i-a20-haoyu-marsboard.dts +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 +Auto-merging drivers/tee/optee/ffa_abi.c +Merge made by the 'ort' strategy. +Merging tegra/for-next (33e9d249ce3e Merge branch for-5.18/arm64/dt 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 'ort' strategy. + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 133 +++++++++++++++++++++++++++++ + drivers/soc/tegra/fuse/fuse-tegra.c | 20 ++++- + drivers/soc/tegra/pmc.c | 4 +- + include/dt-bindings/clock/tegra234-clock.h | 35 +++++++- + include/dt-bindings/reset/tegra234-reset.h | 16 ++++ + 5 files changed, 204 insertions(+), 4 deletions(-) +Merging ti/ti-next (3be5bf60d055 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 +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 18 ++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-am64.dtsi | 2 ++ + drivers/firmware/ti_sci.c | 2 +- + drivers/soc/ti/k3-ringacc.c | 15 ++++++--------- + drivers/soc/ti/smartreflex.c | 13 +++++++------ + drivers/soc/ti/wkup_m3_ipc.c | 4 ++-- + include/linux/soc/ti/ti_sci_protocol.h | 2 +- + 7 files changed, 37 insertions(+), 19 deletions(-) +Merging xilinx/for-next (3a14f0e61408 arm64: zynqmp: Rename dma to dma-controller) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 76 ++++++++++++++-------------------- + 1 file changed, 32 insertions(+), 44 deletions(-) +Merging clk/clk-next (28c7bbb2a3fc Merge branch 'clk-kunit' 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/microchip,mpfs.yaml | 58 +++ + drivers/clk/.kunitconfig | 3 + + drivers/clk/Kconfig | 8 + + drivers/clk/Makefile | 1 + + drivers/clk/at91/sama5d2.c | 4 +- + drivers/clk/at91/sama7g5.c | 8 +- + drivers/clk/clk-gate_test.c | 464 +++++++++++++++++++++ + drivers/clk/clk-si5341.c | 24 +- + drivers/clk/clk-stm32mp1.c | 46 +- + drivers/clk/mediatek/clk-mt8192.c | 36 +- + drivers/clk/zynqmp/clk-gate-zynqmp.c | 12 +- + drivers/clk/zynqmp/clk-mux-zynqmp.c | 8 +- + drivers/clk/zynqmp/divider.c | 12 +- + drivers/clk/zynqmp/pll.c | 32 +- + include/dt-bindings/clock/at91.h | 2 + + include/dt-bindings/clock/microchip,mpfs-clock.h | 45 ++ + 16 files changed, 705 insertions(+), 58 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/microchip,mpfs.yaml + create mode 100644 drivers/clk/.kunitconfig + create mode 100644 drivers/clk/clk-gate_test.c + create mode 100644 include/dt-bindings/clock/microchip,mpfs-clock.h +Merging clk-imx/for-next (036a4b4b4dfa clk: imx: Add imx8dxl clk driver) +$ 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 'ort' strategy. + .../devicetree/bindings/clock/imxrt1050-clock.yaml | 67 ++++++++ + drivers/clk/imx/Kconfig | 7 + + drivers/clk/imx/Makefile | 4 +- + drivers/clk/imx/clk-imx8dxl-rsrc.c | 66 ++++++++ + drivers/clk/imx/clk-imx8qxp.c | 1 + + drivers/clk/imx/clk-imxrt1050.c | 168 +++++++++++++++++++++ + drivers/clk/imx/clk-scu.h | 1 + + include/dt-bindings/clock/imxrt1050-clock.h | 72 +++++++++ + 8 files changed, 385 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/clock/imxrt1050-clock.yaml + create mode 100644 drivers/clk/imx/clk-imx8dxl-rsrc.c + create mode 100644 drivers/clk/imx/clk-imxrt1050.c + create mode 100644 include/dt-bindings/clock/imxrt1050-clock.h +Merging clk-renesas/renesas-clk (9b90413c0524 clk: renesas: rzg2l-cpg: Add support for RZ/V2L SoC) +$ 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 'ort' strategy. + .../bindings/clock/renesas,rzg2l-cpg.yaml | 14 +- + drivers/clk/renesas/Kconfig | 7 +- + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a77990-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 2 + + drivers/clk/renesas/r9a07g044-cpg.c | 539 ++++++++++++--------- + drivers/clk/renesas/rzg2l-cpg.c | 6 + + drivers/clk/renesas/rzg2l-cpg.h | 1 + + 10 files changed, 325 insertions(+), 248 deletions(-) +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 +Already up to date. +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 arch/h8300/Kconfig.cpu +Auto-merging arch/h8300/include/asm/processor.h +Auto-merging arch/h8300/kernel/setup.c +Auto-merging arch/h8300/mm/init.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/tty/serial/sh-sci.c +Merge made by the 'ort' 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 (469d56485c1b m68k: mm: Remove check for VM_IO to fix deferred I/O) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'ort' strategy. + arch/m68k/amiga/config.c | 1 + + arch/m68k/apollo/config.c | 1 + + arch/m68k/atari/config.c | 1 + + arch/m68k/bvme6000/config.c | 1 + + arch/m68k/hp300/config.c | 1 + + arch/m68k/include/asm/config.h | 33 +++++++++++++++++++++++++++++++++ + arch/m68k/kernel/setup_mm.c | 23 +---------------------- + arch/m68k/mac/config.c | 1 + + arch/m68k/mm/fault.c | 2 -- + arch/m68k/mvme147/config.c | 1 + + arch/m68k/mvme16x/config.c | 1 + + arch/m68k/q40/config.c | 1 + + 12 files changed, 43 insertions(+), 24 deletions(-) + create mode 100644 arch/m68k/include/asm/config.h +Merging m68knommu/for-next (021ff8547d2a m68k: m5441x: remove erroneous clock disable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/68000/dragen2.c | 1 + + arch/m68k/68000/screen.h | 2 ++ + arch/m68k/68000/ucsimm.c | 9 ++++----- + arch/m68k/coldfire/m5441x.c | 1 - + 4 files changed, 7 insertions(+), 6 deletions(-) +Merging microblaze/next (fcc619621df5 microblaze/PCI: Remove pci_phys_mem_access_prot() dead code) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'ort' strategy. + arch/microblaze/include/asm/pci.h | 4 ---- + arch/microblaze/kernel/signal.c | 2 +- + arch/microblaze/pci/pci-common.c | 49 --------------------------------------- + arch/microblaze/pci/xilinx_pci.c | 2 +- + 4 files changed, 2 insertions(+), 55 deletions(-) +Merging mips/mips-next (c47c7ab9b536 MIPS: Malta: Enable BLK_DEV_INITRD) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Merge made by the 'ort' strategy. + arch/mips/Kconfig | 5 +++++ + arch/mips/ath79/early_printk.c | 1 + + arch/mips/ath79/setup.c | 6 ++++++ + arch/mips/boot/compressed/Makefile | 1 + + arch/mips/configs/malta_defconfig | 1 + + arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 1 + + arch/mips/loongson2ef/Platform | 3 ++- + arch/mips/loongson64/Platform | 24 +++++------------------- + arch/mips/vdso/Makefile | 3 +++ + 9 files changed, 25 insertions(+), 20 deletions(-) +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/Kbuild +CONFLICT (content): Merge conflict in arch/nds32/Kbuild +Auto-merging arch/nds32/Kconfig +CONFLICT (content): Merge conflict in arch/nds32/Kconfig +Auto-merging arch/nds32/Makefile +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 50826580d10c] 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 (2719229eda8e openrisc: remove CONFIG_SET_FS) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'ort' strategy. + arch/openrisc/Kconfig | 1 - + arch/openrisc/include/asm/thread_info.h | 7 ----- + arch/openrisc/include/asm/uaccess.h | 48 ++++++++++++++------------------- + arch/openrisc/lib/memcpy.c | 2 +- + 4 files changed, 21 insertions(+), 37 deletions(-) +Merging parisc-hd/for-next (49c3c08b317d parisc: Fix random get_user()/put_user() failures) +$ 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 +Merge made by the 'ort' strategy. + arch/parisc/include/asm/uaccess.h | 15 ++++++++------- + arch/parisc/lib/iomap.c | 18 ++++++++++++++++++ + arch/parisc/mm/init.c | 9 ++++----- + drivers/parisc/ccio-dma.c | 3 ++- + drivers/parisc/sba_iommu.c | 3 ++- + 5 files changed, 34 insertions(+), 14 deletions(-) +Merging powerpc/next (29ec39fcf11e Merge tag 'powerpc-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value) +$ 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 'ort' strategy. + .../bindings/arm/freescale/fsl,layerscape-dcfg.txt | 2 +- + Documentation/devicetree/bindings/clock/qoriq-clock.txt | 1 + + MAINTAINERS | 4 ++-- + drivers/soc/fsl/guts.c | 14 +++++++++----- + drivers/soc/fsl/qe/qe.c | 4 ++-- + drivers/soc/fsl/qe/qe_io.c | 2 ++ + 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 +- + 11 files changed, 26 insertions(+), 15 deletions(-) +Merging risc-v/for-next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging s390/for-next (a086db89b45c 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 +Auto-merging MAINTAINERS +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +- + arch/s390/boot/head.S | 1 - + arch/s390/include/asm/crw.h | 1 - + arch/s390/include/asm/nmi.h | 1 - + arch/s390/include/asm/sclp.h | 1 - + arch/s390/include/asm/smp.h | 1 - + arch/s390/kernel/base.S | 3 +- + arch/s390/kernel/cache.c | 1 - + arch/s390/kernel/early.c | 1 - + arch/s390/kernel/entry.S | 1 - + arch/s390/kernel/ftrace.c | 46 ++++++---- + arch/s390/kernel/head64.S | 1 - + arch/s390/kernel/ipl.c | 1 - + arch/s390/kernel/lgr.c | 3 +- + arch/s390/kernel/machine_kexec.c | 1 - + arch/s390/kernel/mcount.S | 2 - + arch/s390/kernel/nmi.c | 1 - + arch/s390/kernel/os_info.c | 4 +- + arch/s390/kernel/relocate_kernel.S | 3 +- + arch/s390/kernel/smp.c | 1 - + arch/s390/kernel/stacktrace.c | 1 - + arch/s390/kernel/topology.c | 1 - + arch/s390/kvm/kvm-s390.c | 1 - + arch/s390/lib/delay.c | 1 - + arch/s390/mm/maccess.c | 19 ++--- + arch/s390/mm/vmem.c | 1 - + drivers/s390/char/sclp_cmd.c | 3 +- + drivers/s390/char/sclp_config.c | 1 - + drivers/s390/char/sclp_sdias.c | 2 +- + drivers/s390/cio/crw.c | 1 - + drivers/s390/crypto/ap_bus.h | 1 + + drivers/s390/crypto/vfio_ap_debug.h | 32 +++++++ + drivers/s390/crypto/vfio_ap_drv.c | 21 +++++ + drivers/s390/crypto/vfio_ap_ops.c | 151 ++++++++++++++++++++++++++++++--- + tools/perf/arch/s390/util/dwarf-regs.c | 3 +- + 35 files changed, 239 insertions(+), 78 deletions(-) + create mode 100644 drivers/s390/crypto/vfio_ap_debug.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 +Already up to date. +Merging xtensa/xtensa-for-next (8a900dc390da xtensa: Remove unused early_read_config_byte() et al declarations) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/include/asm/pci-bridge.h | 9 --------- + arch/xtensa/kernel/setup.c | 8 ++++---- + arch/xtensa/platforms/iss/network.c | 4 ++-- + 3 files changed, 6 insertions(+), 15 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/namespace.c +Merge made by the 'ort' strategy. + fs/namespace.c | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) +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 (dd81e1c7d5fb Merge tag 'powerpc-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (26291c54e111 Linux 5.17-rc2) +$ 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 (80839488f2a7 Merge branch 'for-next-next-v5.17-20220204' into for-next-20220204) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/send.c +Auto-merging fs/btrfs/transaction.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/btrfs/block-group.c | 28 +- + fs/btrfs/block-group.h | 1 + + fs/btrfs/btrfs_inode.h | 12 +- + fs/btrfs/compression.c | 11 +- + fs/btrfs/compression.h | 8 +- + fs/btrfs/ctree.c | 66 ++- + fs/btrfs/ctree.h | 79 ++- + fs/btrfs/delalloc-space.c | 18 +- + fs/btrfs/dev-replace.c | 18 +- + fs/btrfs/disk-io.c | 195 +++++-- + fs/btrfs/disk-io.h | 2 + + fs/btrfs/extent-tree.c | 7 +- + fs/btrfs/extent_io.c | 116 ++-- + fs/btrfs/extent_map.c | 4 + + fs/btrfs/file-item.c | 35 +- + fs/btrfs/file.c | 72 ++- + fs/btrfs/free-space-tree.c | 2 + + fs/btrfs/inode.c | 1161 +++++++++++++++++++++++++++++-------- + fs/btrfs/ioctl.c | 345 +++++++++-- + fs/btrfs/ordered-data.c | 131 ++--- + fs/btrfs/ordered-data.h | 25 +- + fs/btrfs/print-tree.c | 1 + + fs/btrfs/qgroup.c | 19 +- + fs/btrfs/relocation.c | 2 +- + fs/btrfs/scrub.c | 702 +++++++++++++--------- + fs/btrfs/send.c | 11 +- + fs/btrfs/send.h | 2 +- + fs/btrfs/subpage.c | 30 +- + fs/btrfs/subpage.h | 25 + + fs/btrfs/super.c | 28 +- + fs/btrfs/sysfs.c | 21 +- + fs/btrfs/tests/extent-map-tests.c | 2 + + fs/btrfs/transaction.c | 15 + + fs/btrfs/tree-checker.c | 35 +- + fs/btrfs/tree-log.c | 651 +++++++++++++-------- + fs/btrfs/tree-log.h | 7 +- + fs/btrfs/volumes.c | 158 +++-- + fs/btrfs/volumes.h | 7 +- + fs/btrfs/zoned.c | 167 ++++-- + fs/internal.h | 5 - + fs/read_write.c | 34 +- + include/linux/fs.h | 2 + + include/trace/events/btrfs.h | 1 + + include/uapi/linux/btrfs.h | 133 +++++ + include/uapi/linux/btrfs_tree.h | 3 + + 45 files changed, 3085 insertions(+), 1312 deletions(-) +Merging ceph/master (038b8d1d1ab1 libceph: optionally use bounce buffer on recv path in crc mode) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (0e91de9ca5c0 cifs: channel helper functions should set tcpStatus) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/cifs/cifs_swn.c | 6 +++--- + fs/cifs/cifsproto.h | 2 ++ + fs/cifs/connect.c | 33 ++++++++++++++++++++++++++------- + fs/cifs/dfs_cache.c | 2 +- + fs/cifs/sess.c | 14 ++++++++++++++ + fs/cifs/smb1ops.c | 4 +--- + fs/cifs/transport.c | 5 +---- + 7 files changed, 48 insertions(+), 18 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 (dfd42facf1e4 Linux 5.17-rc3) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (dd81e1c7d5fb Merge tag 'powerpc-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (ee12595147ac fanotify: Fix stale file descriptor in copy_event_to_user()) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Already up to date. +Merging ext4/dev (dfd42facf1e4 Linux 5.17-rc3) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (728b9b5874f8 f2fs: add a way to limit roll forward recovery time) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/dir.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/recovery.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/sysfs.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 36 +++++++- + fs/f2fs/acl.c | 21 +++-- + fs/f2fs/checkpoint.c | 43 +++++---- + fs/f2fs/compress.c | 6 +- + fs/f2fs/data.c | 68 +++++++------- + fs/f2fs/debug.c | 3 + + fs/f2fs/dir.c | 12 +-- + fs/f2fs/f2fs.h | 126 +++++++++++++++++++++----- + fs/f2fs/file.c | 153 +++++++++++++++++--------------- + fs/f2fs/gc.c | 50 ++++++----- + fs/f2fs/inline.c | 4 +- + fs/f2fs/namei.c | 75 ++++++++-------- + fs/f2fs/node.c | 86 +++++++++--------- + fs/f2fs/node.h | 3 + + fs/f2fs/recovery.c | 35 ++++++-- + fs/f2fs/segment.c | 66 +++++++------- + fs/f2fs/segment.h | 5 +- + fs/f2fs/super.c | 75 +++++++++------- + fs/f2fs/sysfs.c | 16 +++- + fs/f2fs/verity.c | 4 +- + fs/f2fs/xattr.c | 12 +-- + 21 files changed, 553 insertions(+), 346 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 +Already up to date. +Merging gfs2/for-next (9421fdba4215 gfs2: Initialize gh_error in gfs2_glock_nq) +$ 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 'ort' strategy. + fs/gfs2/bmap.c | 2 +- + fs/gfs2/file.c | 8 ++++---- + fs/gfs2/glock.c | 14 ++++++++++++-- + fs/gfs2/inode.c | 51 ++++++++++++++++++++++++++++----------------------- + fs/gfs2/lock_dlm.c | 15 ++++++++++++++- + fs/gfs2/rgrp.c | 16 +++++++++------- + fs/gfs2/rgrp.h | 2 +- + fs/gfs2/super.c | 2 +- + 8 files changed, 70 insertions(+), 40 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 (1a927cda94ac Documentation: ksmbd: update Feature Status table) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + Documentation/filesystems/cifs/ksmbd.rst | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging nfs/linux-next (dfd42facf1e4 Linux 5.17-rc3) +$ 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 (b49ea673e119 SUNRPC: lock against ->sock changing during sysfs read) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/for-next (8dfa08baad02 SUNRPC: Record endpoint information in trace log) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/trace.h +Merge made by the 'ort' strategy. + fs/nfsd/nfs4xdr.c | 10 ++ + fs/nfsd/nfscache.c | 33 +++--- + fs/nfsd/nfsd.h | 2 +- + fs/nfsd/trace.h | 107 +++++++++--------- + include/trace/bpf_probe.h | 6 ++ + include/trace/events/sunrpc.h | 244 ++++++++++++++++++++++++++---------------- + include/trace/perf.h | 6 ++ + include/trace/trace_events.h | 55 +++++++++- + kernel/trace/trace_events.c | 6 ++ + 9 files changed, 298 insertions(+), 171 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/file.c +Auto-merging fs/ntfs3/inode.c +Merge made by the 'ort' 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 +Already up to date. +Merging overlayfs/overlayfs-next (94fd19752b28 ovl: don't fail copy up if no fileattr support on upper) +$ 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 +Already up to date. +Merging v9fs/9p-next (22e424feb665 Revert "fs/9p: search open fids first") +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (cea267c235e1 xfs: ensure log flush at the end of a synchronous fallocate call) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +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 'ort' strategy. +Merging iomap/iomap-for-next (ebb7fb1557b1 xfs, iomap: limit individual ioend chain lengths in writeback) +$ 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 (2d86293c7075 xfs: return errors in xfs_fs_sync_fs) +$ 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 'ort' strategy. +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 +Auto-merging fs/io_uring.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/fs.h +Auto-merging init/do_mounts.c +Merge made by the 'ort' strategy. +Merging printk/for-next (65c2c0709d8e Merge branch 'rework/fast-next-seq' 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 'ort' strategy. + kernel/printk/printk_ringbuffer.c | 52 +++++++++++++++++++++++++++++++++++---- + kernel/printk/printk_ringbuffer.h | 2 ++ + 2 files changed, 49 insertions(+), 5 deletions(-) +Merging pci/next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Already up to date. +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 +Already up to date. +Merging hid/for-next (2b3566c337c3 Merge branch 'for-5.17/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 +Merge made by the 'ort' strategy. + drivers/hid/Kconfig | 10 ++ + drivers/hid/Makefile | 1 + + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 11 +- + .../amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c | 4 +- + drivers/hid/hid-apple.c | 16 +-- + drivers/hid/hid-elo.c | 1 + + drivers/hid/hid-google-hammer.c | 2 +- + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-quirks.c | 1 + + drivers/hid/hid-sigmamicro.c | 130 +++++++++++++++++++++ + drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 28 ++--- + 11 files changed, 173 insertions(+), 33 deletions(-) + create mode 100644 drivers/hid/hid-sigmamicro.c +Merging i2c/i2c/for-next (b993fe2dc6b5 Merge branch 'i2c/for-mergewindow' 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/i2c-mt65xx.txt | 1 + + Documentation/firmware-guide/acpi/enumeration.rst | 39 ++++++++++++++++++++++ + drivers/base/property.c | 29 ++++++++++++++++ + drivers/i2c/busses/i2c-amd-mp2-pci.c | 7 ++-- + drivers/i2c/busses/i2c-bcm2835.c | 32 +++++++++++++++--- + drivers/i2c/busses/i2c-mt65xx.c | 14 ++++++++ + drivers/i2c/busses/i2c-npcm7xx.c | 16 ++++----- + drivers/i2c/i2c-core-acpi.c | 17 ++++------ + drivers/i2c/i2c-core-base.c | 2 +- + drivers/i2c/i2c-core-smbus.c | 11 +++--- + drivers/i2c/i2c-smbus.c | 5 +-- + include/linux/i2c-smbus.h | 6 ++-- + include/linux/property.h | 1 + + 13 files changed, 140 insertions(+), 40 deletions(-) +Merging i3c/i3c/next (13462ba1815d i3c: master: dw: check return of dw_i3c_master_get_free_pos()) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +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 (b460ae6643ad Merge tag 'ib-mfd-hwmon-regulator-v5.18' into hwmon-next) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/obsolete/procfs-i8k | 10 + + Documentation/ABI/testing/sysfs-class-hwmon | 8 + + Documentation/admin-guide/kernel-parameters.txt | 35 +- + .../devicetree/bindings/hwmon/national,lm90.yaml | 4 +- + .../devicetree/bindings/mfd/silergy,sy7636a.yaml | 82 +++ + Documentation/hwmon/asus_ec_sensors.rst | 54 ++ + Documentation/hwmon/index.rst | 2 + + Documentation/hwmon/max6639.rst | 2 +- + Documentation/hwmon/sy7636a-hwmon.rst | 26 + + Documentation/hwmon/sysfs-interface.rst | 4 + + MAINTAINERS | 7 + + drivers/hwmon/Kconfig | 27 +- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adt7310.c | 95 ++- + drivers/hwmon/adt7410.c | 82 ++- + drivers/hwmon/adt7x10.c | 479 ++++++-------- + drivers/hwmon/adt7x10.h | 10 +- + drivers/hwmon/asus-ec-sensors.c | 709 +++++++++++++++++++++ + drivers/hwmon/asus_wmi_ec_sensors.c | 3 +- + drivers/hwmon/asus_wmi_sensors.c | 1 + + drivers/hwmon/hwmon.c | 39 +- + drivers/hwmon/lm83.c | 476 ++++++++------ + drivers/hwmon/max6639.c | 62 +- + drivers/hwmon/mlxreg-fan.c | 84 +-- + drivers/hwmon/nct6775.c | 146 ++++- + drivers/hwmon/pmbus/Kconfig | 4 +- + drivers/hwmon/powr1220.c | 235 ++++--- + drivers/hwmon/sch5627.c | 10 + + drivers/hwmon/sch5636.c | 10 + + drivers/hwmon/sch56xx-common.c | 44 +- + drivers/hwmon/sy7636a-hwmon.c | 106 +++ + drivers/mfd/Kconfig | 2 +- + drivers/mfd/simple-mfd-i2c.c | 11 + + drivers/regulator/Kconfig | 1 - + drivers/regulator/sy7636a-regulator.c | 7 +- + include/linux/mfd/sy7636a.h | 34 + + 36 files changed, 2171 insertions(+), 742 deletions(-) + create mode 100644 Documentation/ABI/obsolete/procfs-i8k + create mode 100644 Documentation/devicetree/bindings/mfd/silergy,sy7636a.yaml + create mode 100644 Documentation/hwmon/asus_ec_sensors.rst + create mode 100644 Documentation/hwmon/sy7636a-hwmon.rst + create mode 100644 drivers/hwmon/asus-ec-sensors.c + create mode 100644 drivers/hwmon/sy7636a-hwmon.c + create mode 100644 include/linux/mfd/sy7636a.h +Merging jc_docs/docs-next (869f496e1aa6 docs: process: submitting-patches: Clarify the Reported-by usage) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'ort' strategy. + Documentation/core-api/entry.rst | 279 +++++++++++++++++ + Documentation/core-api/index.rst | 8 + + Documentation/process/submitting-patches.rst | 3 +- + .../zh_CN/accounting/delay-accounting.rst | 62 ++-- + Documentation/translations/zh_CN/index.rst | 10 +- + Documentation/translations/zh_CN/power/index.rst | 56 ++++ + Documentation/translations/zh_CN/power/opp.rst | 341 +++++++++++++++++++++ + Documentation/translations/zh_CN/vm/active_mm.rst | 85 +++++ + Documentation/translations/zh_CN/vm/balance.rst | 81 +++++ + Documentation/translations/zh_CN/vm/damon/api.rst | 32 ++ + .../translations/zh_CN/vm/damon/design.rst | 139 +++++++++ + Documentation/translations/zh_CN/vm/damon/faq.rst | 48 +++ + .../translations/zh_CN/vm/damon/index.rst | 33 ++ + .../translations/zh_CN/vm/free_page_reporting.rst | 38 +++ + Documentation/translations/zh_CN/vm/highmem.rst | 128 ++++++++ + Documentation/translations/zh_CN/vm/index.rst | 52 ++++ + 16 files changed, 1357 insertions(+), 38 deletions(-) + create mode 100644 Documentation/core-api/entry.rst + create mode 100644 Documentation/translations/zh_CN/power/index.rst + create mode 100644 Documentation/translations/zh_CN/power/opp.rst + create mode 100644 Documentation/translations/zh_CN/vm/active_mm.rst + create mode 100644 Documentation/translations/zh_CN/vm/balance.rst + create mode 100644 Documentation/translations/zh_CN/vm/damon/api.rst + create mode 100644 Documentation/translations/zh_CN/vm/damon/design.rst + create mode 100644 Documentation/translations/zh_CN/vm/damon/faq.rst + create mode 100644 Documentation/translations/zh_CN/vm/damon/index.rst + create mode 100644 Documentation/translations/zh_CN/vm/free_page_reporting.rst + create mode 100644 Documentation/translations/zh_CN/vm/highmem.rst + create mode 100644 Documentation/translations/zh_CN/vm/index.rst +Merging v4l-dvb/master (68a99f6a0ebf media: lirc: report ir receiver overflow) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging MAINTAINERS +Auto-merging drivers/memory/mtk-smi.c +Merge made by the 'ort' strategy. + .../bindings/display/mediatek/mediatek,disp.txt | 9 - + .../bindings/media/i2c/maxim,max9286.yaml | 275 +- + .../bindings/media/mediatek,vcodec-decoder.yaml | 169 ++ + .../bindings/media/mediatek,vcodec-encoder.yaml | 179 ++ + .../media/mediatek,vcodec-subdev-decoder.yaml | 265 ++ + .../bindings/media/mediatek-jpeg-decoder.txt | 38 - + .../bindings/media/mediatek-jpeg-decoder.yaml | 80 + + .../bindings/media/mediatek-jpeg-encoder.txt | 35 - + .../bindings/media/mediatek-jpeg-encoder.yaml | 72 + + .../devicetree/bindings/media/mediatek-mdp.txt | 8 - + .../devicetree/bindings/media/mediatek-vcodec.txt | 131 - + .../bindings/media/microchip,csi2dc.yaml | 197 ++ + .../devicetree/bindings/media/nxp,imx7-csi.yaml | 1 + + .../bindings/media/qcom,msm8916-camss.yaml | 10 - + .../bindings/media/qcom,msm8996-camss.yaml | 20 - + .../bindings/media/qcom,sdm660-camss.yaml | 20 - + .../bindings/media/qcom,sdm845-camss.yaml | 17 - + .../bindings/media/qcom,sm8250-camss.yaml | 450 +++ + .../userspace-api/media/lirc.h.rst.exceptions | 3 + + .../userspace-api/media/rc/lirc-dev-intro.rst | 11 +- + .../userspace-api/media/rc/lirc-get-features.rst | 18 - + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 16 +- + .../userspace-api/media/v4l/pixfmt-yuv-luma.rst | 4 +- + .../userspace-api/media/v4l/v4l2grab.c.rst | 2 +- + .../userspace-api/media/v4l/vidioc-qbuf.rst | 2 +- + MAINTAINERS | 30 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 8 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 9 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 15 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 36 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 - + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +- + drivers/iommu/mtk_iommu.c | 34 + + drivers/iommu/mtk_iommu_v1.c | 42 +- + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 2 + + drivers/media/i2c/Kconfig | 26 + + drivers/media/i2c/Makefile | 2 + + drivers/media/i2c/dw9714.c | 42 +- + drivers/media/i2c/hi847.c | 3012 ++++++++++++++++++++ + drivers/media/i2c/max9286.c | 125 +- + drivers/media/i2c/ov08d10.c | 1526 ++++++++++ + drivers/media/i2c/ov2740.c | 8 +- + drivers/media/i2c/ov5648.c | 6 +- + drivers/media/i2c/ov5693.c | 9 +- + drivers/media/i2c/ov6650.c | 192 +- + drivers/media/i2c/ov8865.c | 8 +- + drivers/media/i2c/tc358743.c | 2 +- + drivers/media/pci/bt8xx/bttv-driver.c | 4 +- + drivers/media/pci/cx23885/cx23885-input.c | 2 +- + drivers/media/pci/saa7134/saa7134-video.c | 9 +- + drivers/media/platform/Makefile | 1 + + drivers/media/platform/aspeed-video.c | 219 +- + drivers/media/platform/atmel/Kconfig | 15 + + drivers/media/platform/atmel/Makefile | 4 +- + drivers/media/platform/atmel/atmel-isc-base.c | 397 +-- + drivers/media/platform/atmel/atmel-isc-clk.c | 311 ++ + drivers/media/platform/atmel/atmel-isc.h | 11 + + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 24 + + drivers/media/platform/atmel/atmel-sama7g5-isc.c | 32 +- + drivers/media/platform/atmel/microchip-csi2dc.c | 806 ++++++ + drivers/media/platform/coda/coda-common.c | 1 + + drivers/media/platform/coda/imx-vdoa.c | 9 +- + drivers/media/platform/davinci/vpif.c | 111 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 14 +- + drivers/media/platform/exynos4-is/fimc-core.c | 11 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 11 +- + drivers/media/platform/imx-jpeg/mxc-jpeg.c | 18 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 8 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 45 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 2 - + drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 40 - + drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 2 - + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 1 - + drivers/media/platform/mtk-vcodec/Makefile | 6 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 4 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 1 + + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 176 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c | 200 ++ + .../media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h | 56 + + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 136 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 11 +- + .../platform/mtk-vcodec/mtk_vcodec_dec_stateful.c | 2 + + .../platform/mtk-vcodec/mtk_vcodec_dec_stateless.c | 21 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 77 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1 - + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 19 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 55 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h | 3 +- + .../media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c | 2 + + .../media/platform/mtk-vcodec/mtk_vcodec_intr.c | 30 +- + .../media/platform/mtk-vcodec/mtk_vcodec_intr.h | 5 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.c | 59 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.h | 8 +- + .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 2 +- + .../platform/mtk-vcodec/vdec/vdec_h264_req_if.c | 2 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 2 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 2 +- + drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 21 +- + drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 16 +- + drivers/media/platform/mtk-vcodec/vdec_msg_queue.c | 290 ++ + drivers/media/platform/mtk-vcodec/vdec_msg_queue.h | 153 + + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 46 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 22 + + .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 2 +- + .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 2 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 10 +- + drivers/media/platform/pxa_camera.c | 9 +- + drivers/media/platform/qcom/camss/Makefile | 3 +- + .../camss/{camss-csid-170.c => camss-csid-gen2.c} | 32 +- + drivers/media/platform/qcom/camss/camss-csid.c | 68 +- + drivers/media/platform/qcom/camss/camss-csid.h | 2 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 184 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 21 +- + drivers/media/platform/qcom/camss/camss-ispif.c | 12 +- + drivers/media/platform/qcom/camss/camss-vfe-170.c | 12 +- + drivers/media/platform/qcom/camss/camss-vfe-480.c | 564 ++++ + drivers/media/platform/qcom/camss/camss-vfe.c | 29 +- + drivers/media/platform/qcom/camss/camss-vfe.h | 4 + + drivers/media/platform/qcom/camss/camss-video.c | 5 +- + drivers/media/platform/qcom/camss/camss.c | 308 +- + drivers/media/platform/qcom/camss/camss.h | 18 + + drivers/media/platform/rcar-vin/rcar-vin.h | 2 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 28 +- + drivers/media/platform/s5p-g2d/g2d.c | 10 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 11 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 10 +- + drivers/media/platform/stm32/dma2d/dma2d.c | 9 +- + drivers/media/platform/stm32/stm32-dcmi.c | 53 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h | 2 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 2 +- + drivers/media/platform/ti-vpe/cal-camerarx.c | 6 +- + drivers/media/platform/vsp1/vsp1_drv.c | 14 +- + drivers/media/radio/radio-sf16fmi.c | 2 +- + drivers/media/rc/fintek-cir.c | 2 +- + drivers/media/rc/igorplugusb.c | 2 +- + drivers/media/rc/iguanair.c | 2 +- + drivers/media/rc/ir-hix5hd2.c | 2 +- + drivers/media/rc/ir-imon-decoder.c | 2 +- + drivers/media/rc/ir-jvc-decoder.c | 2 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 2 +- + drivers/media/rc/ir-nec-decoder.c | 2 +- + drivers/media/rc/ir-rc5-decoder.c | 2 +- + drivers/media/rc/ir-rc6-decoder.c | 2 +- + drivers/media/rc/ir-rcmm-decoder.c | 2 +- + drivers/media/rc/ir-sanyo-decoder.c | 4 +- + drivers/media/rc/ir-sharp-decoder.c | 2 +- + drivers/media/rc/ir-sony-decoder.c | 2 +- + drivers/media/rc/ir-xmp-decoder.c | 2 +- + drivers/media/rc/ir_toy.c | 2 +- + drivers/media/rc/ite-cir.c | 2 +- + drivers/media/rc/lirc_dev.c | 36 +- + drivers/media/rc/mtk-cir.c | 39 +- + drivers/media/rc/nuvoton-cir.c | 2 +- + drivers/media/rc/rc-core-priv.h | 2 +- + drivers/media/rc/rc-ir-raw.c | 2 - + drivers/media/rc/rc-loopback.c | 6 +- + drivers/media/rc/st_rc.c | 2 +- + drivers/media/rc/sunxi-cir.c | 2 +- + drivers/media/rc/winbond-cir.c | 2 +- + drivers/media/test-drivers/vivid/vivid-core.h | 5 +- + drivers/media/test-drivers/vivid/vivid-ctrls.c | 32 +- + .../media/test-drivers/vivid/vivid-kthread-cap.c | 7 +- + .../media/test-drivers/vivid/vivid-kthread-out.c | 9 +- + .../media/test-drivers/vivid/vivid-kthread-touch.c | 7 + + drivers/media/test-drivers/vivid/vivid-sdr-cap.c | 12 +- + drivers/media/test-drivers/vivid/vivid-touch-cap.c | 2 +- + drivers/media/usb/gspca/jl2005bcd.c | 4 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 2 +- + drivers/media/v4l2-core/v4l2-dev.c | 68 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 12 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 12 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 53 +- + drivers/media/v4l2-core/v4l2-subdev.c | 8 - + drivers/memory/mtk-smi.c | 14 - + drivers/staging/media/hantro/TODO | 7 - + drivers/staging/media/hantro/hantro.h | 1 - + drivers/staging/media/hantro/hantro_drv.c | 41 +- + drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 27 +- + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 41 +- + drivers/staging/media/hantro/hantro_h1_regs.h | 2 +- + drivers/staging/media/hantro/hantro_hw.h | 11 - + drivers/staging/media/hantro/hantro_jpeg.c | 86 +- + drivers/staging/media/hantro/hantro_jpeg.h | 2 +- + drivers/staging/media/hantro/hantro_v4l2.c | 77 + + .../media/hantro/rockchip_vpu2_hw_jpeg_enc.c | 44 +- + drivers/staging/media/hantro/rockchip_vpu_hw.c | 6 - + drivers/staging/media/imx/imx7-media-csi.c | 32 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 46 +- + drivers/staging/media/imx/imx8mq-mipi-csi2.c | 76 +- + drivers/staging/media/max96712/max96712.c | 2 +- + drivers/staging/media/meson/vdec/esparser.c | 7 +- + drivers/staging/media/meson/vdec/vdec_helpers.c | 8 +- + drivers/staging/media/meson/vdec/vdec_helpers.h | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 2 +- + drivers/staging/media/zoran/Kconfig | 38 +- + drivers/staging/media/zoran/Makefile | 8 +- + drivers/staging/media/zoran/videocodec.c | 68 +- + drivers/staging/media/zoran/videocodec.h | 4 +- + drivers/staging/media/zoran/zoran.h | 18 +- + drivers/staging/media/zoran/zoran_card.c | 398 ++- + drivers/staging/media/zoran/zoran_device.c | 15 +- + drivers/staging/media/zoran/zoran_device.h | 2 - + drivers/staging/media/zoran/zoran_driver.c | 56 +- + drivers/staging/media/zoran/zr36016.c | 25 +- + drivers/staging/media/zoran/zr36016.h | 2 + + drivers/staging/media/zoran/zr36050.c | 24 +- + drivers/staging/media/zoran/zr36050.h | 2 + + drivers/staging/media/zoran/zr36060.c | 23 +- + drivers/staging/media/zoran/zr36060.h | 2 + + include/media/hevc-ctrls.h | 6 +- + include/media/rc-core.h | 12 +- + include/media/v4l2-fwnode.h | 61 +- + include/media/v4l2-mediabus.h | 64 +- + include/media/v4l2-subdev.h | 13 - + include/soc/mediatek/smi.h | 20 - + include/uapi/linux/lirc.h | 15 +- + 216 files changed, 11464 insertions(+), 2452 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml + delete mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt + create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.yaml + delete mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt + create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml + delete mode 100644 Documentation/devicetree/bindings/media/mediatek-vcodec.txt + create mode 100644 Documentation/devicetree/bindings/media/microchip,csi2dc.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml + create mode 100644 drivers/media/i2c/hi847.c + create mode 100644 drivers/media/i2c/ov08d10.c + create mode 100644 drivers/media/platform/atmel/atmel-isc-clk.c + create mode 100644 drivers/media/platform/atmel/microchip-csi2dc.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h + create mode 100644 drivers/media/platform/mtk-vcodec/vdec_msg_queue.c + create mode 100644 drivers/media/platform/mtk-vcodec/vdec_msg_queue.h + rename drivers/media/platform/qcom/camss/{camss-csid-170.c => camss-csid-gen2.c} (95%) + create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-480.c +Merging v4l-dvb-next/master (127efdbc51fe media: atomisp: fix dummy_ptr check to avoid duplicate active_bo) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Merge made by the 'ort' strategy. + .../media/atomisp/pci/atomisp_compat_css20.c | 4 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 148 +++++++++++++++------ + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 21 +-- + drivers/staging/media/atomisp/pci/hmm/hmm.c | 7 +- + .../staging/media/atomisp/pci/ia_css_acc_types.h | 5 +- + drivers/staging/media/atomisp/pci/ia_css_env.h | 9 +- + .../media/atomisp/pci/ia_css_event_public.h | 33 ++--- + drivers/staging/media/atomisp/pci/ia_css_irq.h | 77 +++++------ + .../isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c | 2 +- + .../pci/runtime/debug/interface/ia_css_debug.h | 31 ++--- + .../staging/media/atomisp/pci/sh_css_firmware.c | 4 + + 11 files changed, 209 insertions(+), 132 deletions(-) +Merging pm/linux-next (f2edd5978acc Merge branch 'acpi-x86' 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 +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-thermal | 2 +- + Documentation/x86/index.rst | 1 + + Documentation/x86/intel-hfi.rst | 72 +++ + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/msr-index.h | 6 + + arch/x86/kernel/resource.c | 23 +- + drivers/acpi/ec.c | 10 + + drivers/acpi/osl.c | 19 +- + drivers/acpi/property.c | 2 +- + drivers/acpi/sleep.c | 15 +- + drivers/acpi/tables.c | 2 +- + drivers/acpi/x86/s2idle.c | 12 +- + drivers/base/power/wakeup.c | 41 +- + drivers/cpufreq/cpufreq_governor_attr_set.c | 5 - + drivers/cpufreq/longhaul.c | 4 +- + drivers/pnp/pnpacpi/core.c | 4 +- + drivers/thermal/intel/Kconfig | 13 + + drivers/thermal/intel/Makefile | 1 + + .../intel/int340x_thermal/acpi_thermal_rel.c | 23 +- + .../intel/int340x_thermal/int3400_thermal.c | 5 + + drivers/thermal/intel/intel_hfi.c | 569 +++++++++++++++++++++ + drivers/thermal/intel/intel_hfi.h | 17 + + drivers/thermal/intel/intel_powerclamp.c | 9 +- + drivers/thermal/intel/therm_throt.c | 22 + + drivers/thermal/thermal_netlink.c | 53 ++ + drivers/thermal/thermal_netlink.h | 14 + + include/acpi/actypes.h | 4 + + include/acpi/platform/aclinux.h | 5 + + include/linux/cpufreq.h | 5 + + include/linux/suspend.h | 4 +- + include/uapi/linux/thermal.h | 6 +- + kernel/power/main.c | 5 +- + kernel/power/process.c | 2 +- + kernel/power/suspend.c | 2 - + kernel/sched/cpufreq_schedutil.c | 2 +- + tools/power/cpupower/{ToDo => TODO} | 0 + tools/power/cpupower/man/cpupower-idle-set.1 | 2 +- + 37 files changed, 884 insertions(+), 98 deletions(-) + create mode 100644 Documentation/x86/intel-hfi.rst + create mode 100644 drivers/thermal/intel/intel_hfi.c + create mode 100644 drivers/thermal/intel/intel_hfi.h + rename tools/power/cpupower/{ToDo => TODO} (100%) +Merging cpufreq-arm/cpufreq/arm/linux-next (bc8b0c271bbf cpufreq: Add i.MX7S to cpufreq-dt-platdev blocklist) +$ 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 +Auto-merging include/linux/cpufreq.h +Merge made by the 'ort' strategy. + Documentation/cpu-freq/cpu-drivers.rst | 3 +++ + .../translations/zh_CN/cpu-freq/cpu-drivers.rst | 2 ++ + arch/arm/boot/dts/imx7s.dtsi | 16 ++++++++++++++++ + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/cpufreq.c | 4 ++++ + drivers/cpufreq/qcom-cpufreq-hw.c | 13 +++++++++++-- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 2 +- + drivers/cpufreq/scmi-cpufreq.c | 2 +- + include/linux/cpufreq.h | 3 +++ + 9 files changed, 42 insertions(+), 4 deletions(-) +Merging cpupower/cpupower (101025ff8e47 tools/power/cpupower/{ToDo => TODO}: Rename the todo file) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (26291c54e111 Linux 5.17-rc2) +$ 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 +Already up to date. +Merging rdma/for-next (0d9c00117b8a RDMA/mlx4: remove redundant assignment to variable nreq) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Merge made by the 'ort' strategy. + drivers/infiniband/core/addr.c | 1 - + drivers/infiniband/core/cache.c | 1 - + drivers/infiniband/core/cma_configfs.c | 1 - + drivers/infiniband/core/cq.c | 1 - + drivers/infiniband/core/iwpm_util.h | 1 - + drivers/infiniband/core/sa_query.c | 1 - + drivers/infiniband/core/verbs.c | 1 + + drivers/infiniband/hw/hfi1/affinity.c | 1 - + drivers/infiniband/hw/hfi1/debugfs.c | 1 - + drivers/infiniband/hw/hfi1/device.c | 1 - + drivers/infiniband/hw/hfi1/fault.c | 1 - + drivers/infiniband/hw/hfi1/firmware.c | 1 - + drivers/infiniband/hw/mlx4/alias_GUID.c | 1 - + drivers/infiniband/hw/mlx4/srq.c | 1 - + drivers/infiniband/hw/mlx5/ib_virt.c | 1 - + drivers/infiniband/hw/mlx5/mem.c | 1 - + drivers/infiniband/hw/mlx5/mlx5_ib.h | 6 -- + drivers/infiniband/hw/mlx5/qp.c | 4 +- + drivers/infiniband/hw/mlx5/srq.c | 1 - + drivers/infiniband/hw/mthca/mthca_main.c | 8 +- + drivers/infiniband/hw/mthca/mthca_profile.c | 2 - + drivers/infiniband/hw/qib/qib_fs.c | 1 - + drivers/infiniband/hw/usnic/usnic_debugfs.c | 1 - + drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 1 - + drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 1 - + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 1 - + drivers/infiniband/hw/usnic/usnic_transport.c | 1 - + drivers/infiniband/hw/usnic/usnic_vnic.c | 1 - + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 10 +- + drivers/infiniband/sw/rxe/rxe.h | 1 - + drivers/infiniband/sw/rxe/rxe_loc.h | 24 +---- + drivers/infiniband/sw/rxe/rxe_mcast.c | 106 ++++++++++++---------- + drivers/infiniband/sw/rxe/rxe_mmap.c | 1 - + drivers/infiniband/sw/rxe/rxe_net.c | 18 ---- + drivers/infiniband/sw/rxe/rxe_pool.c | 10 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 19 +++- + drivers/infiniband/sw/rxe/rxe_recv.c | 4 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 31 +------ + drivers/infiniband/sw/rxe/rxe_verbs.h | 10 +- + drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 1 - + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 1 - + drivers/infiniband/ulp/iser/iser_memory.c | 1 - + drivers/infiniband/ulp/iser/iser_verbs.c | 1 - + drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 1 - + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 3 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 42 +++++---- + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 1 + + drivers/infiniband/ulp/rtrs/rtrs.c | 1 - + 48 files changed, 125 insertions(+), 205 deletions(-) +Merging net-next/master (1710b52d7c13 net: usb: smsc95xx: add generic selftest support) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Auto-merging drivers/net/dsa/bcm_sf2.c +Auto-merging drivers/net/dsa/mt7530.c +Auto-merging drivers/net/dsa/mv88e6xxx/chip.c +Auto-merging drivers/net/dsa/qca/ar9331.c +Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +Auto-merging drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c +Auto-merging net/dsa/dsa2.c +Auto-merging net/ipv4/ipmr.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv6/ip6_output.c +Auto-merging net/ipv6/ip6mr.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/net.rst | 9 + + Documentation/bpf/btf.rst | 32 +- + .../devicetree/bindings/net/cdns,macb.yaml | 56 ++ + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 6 + + Documentation/devicetree/bindings/net/fsl-fman.txt | 22 +- + .../bindings/net/microchip,lan966x-switch.yaml | 2 + + .../devicetree/bindings/net/renesas,etheravb.yaml | 4 +- + Documentation/networking/ethtool-netlink.rst | 8 + + Documentation/networking/mctp.rst | 48 ++ + MAINTAINERS | 3 +- + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 + + arch/mips/include/uapi/asm/socket.h | 2 + + arch/parisc/include/uapi/asm/socket.h | 2 + + arch/sparc/include/uapi/asm/socket.h | 2 + + drivers/bluetooth/btintel.c | 11 +- + drivers/bluetooth/btintel.h | 1 + + drivers/bluetooth/btmrvl_debugfs.c | 2 +- + drivers/bluetooth/btmrvl_sdio.c | 2 +- + drivers/bluetooth/btmtk.h | 35 + + drivers/bluetooth/btmtksdio.c | 276 +++++-- + drivers/bluetooth/btrtl.c | 8 + + drivers/bluetooth/btusb.c | 14 +- + drivers/bluetooth/hci_h5.c | 5 + + drivers/bluetooth/hci_ll.c | 2 +- + drivers/bluetooth/hci_serdev.c | 3 +- + drivers/net/bonding/bond_alb.c | 31 +- + drivers/net/bonding/bond_main.c | 27 +- + drivers/net/bonding/bond_procfs.c | 1 - + drivers/net/dsa/Kconfig | 12 +- + drivers/net/dsa/Makefile | 3 +- + drivers/net/dsa/b53/b53_common.c | 2 +- + drivers/net/dsa/bcm_sf2.c | 54 +- + drivers/net/dsa/microchip/ksz8795.c | 45 +- + drivers/net/dsa/microchip/ksz9477.c | 9 +- + drivers/net/dsa/microchip/ksz_common.c | 6 + + drivers/net/dsa/microchip/ksz_common.h | 1 + + drivers/net/dsa/mt7530.c | 2 +- + drivers/net/dsa/mv88e6xxx/chip.c | 458 +++++++---- + drivers/net/dsa/mv88e6xxx/chip.h | 7 +- + drivers/net/dsa/mv88e6xxx/global1.h | 1 + + drivers/net/dsa/mv88e6xxx/global1_vtu.c | 5 +- + drivers/net/dsa/mv88e6xxx/global2.h | 3 + + drivers/net/dsa/mv88e6xxx/global2_scratch.c | 28 + + drivers/net/dsa/mv88e6xxx/port.c | 7 +- + drivers/net/dsa/mv88e6xxx/port.h | 7 +- + drivers/net/dsa/mv88e6xxx/serdes.c | 43 +- + drivers/net/dsa/mv88e6xxx/smi.c | 35 +- + drivers/net/dsa/qca/ar9331.c | 45 +- + drivers/net/dsa/qca8k.c | 807 +++++++++++++++--- + drivers/net/dsa/qca8k.h | 46 +- + drivers/net/dsa/realtek-smi-core.c | 523 ------------ + drivers/net/dsa/realtek/Kconfig | 40 + + drivers/net/dsa/realtek/Makefile | 6 + + drivers/net/dsa/realtek/realtek-mdio.c | 229 ++++++ + drivers/net/dsa/realtek/realtek-smi.c | 535 ++++++++++++ + .../dsa/{realtek-smi-core.h => realtek/realtek.h} | 80 +- + drivers/net/dsa/{ => realtek}/rtl8365mb.c | 663 ++++++++------- + .../net/dsa/{rtl8366.c => realtek/rtl8366-core.c} | 164 ++-- + drivers/net/dsa/{ => realtek}/rtl8366rb.c | 457 ++++++----- + drivers/net/dsa/xrs700x/xrs700x.c | 29 +- + drivers/net/ethernet/3com/typhoon.c | 24 +- + drivers/net/ethernet/agere/et131x.c | 14 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 36 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 499 +++++++++++- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 152 +++- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 5 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- + drivers/net/ethernet/cadence/macb.h | 4 + + drivers/net/ethernet/cadence/macb_main.c | 63 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 4 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 3 +- + drivers/net/ethernet/cortina/gemini.c | 8 + + drivers/net/ethernet/dec/tulip/pnic.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 60 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 343 ++++++-- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 18 + + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 2 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 12 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 38 + + drivers/net/ethernet/freescale/enetc/enetc_cbdr.c | 41 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 14 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 103 +-- + drivers/net/ethernet/freescale/fec_main.c | 2 +- + drivers/net/ethernet/freescale/fec_ptp.c | 1 - + drivers/net/ethernet/freescale/xgmac_mdio.c | 91 ++- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 79 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 6 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 11 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 8 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 11 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 8 + + drivers/net/ethernet/intel/e1000e/netdev.c | 22 +- + drivers/net/ethernet/intel/i40e/i40e.h | 4 + + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 92 ++- + drivers/net/ethernet/intel/i40e/i40e_common.c | 155 +++- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 3 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 4 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 52 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 25 + + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 25 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 16 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 9 +- + drivers/net/ethernet/intel/ice/ice_idc.c | 5 + + drivers/net/ethernet/intel/ice/ice_main.c | 2 - + drivers/net/ethernet/intel/ice/ice_txrx.c | 15 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 16 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 - + drivers/net/ethernet/intel/igb/igb_main.c | 38 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 22 +- + drivers/net/ethernet/intel/igc/igc_main.c | 35 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 19 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 20 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 27 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 20 +- + drivers/net/ethernet/marvell/mvneta.c | 319 ++++---- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 247 ++++-- + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 13 + + .../ethernet/marvell/octeontx2/af/lmac_common.h | 10 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 19 + + drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 223 +++-- + drivers/net/ethernet/marvell/octeontx2/af/rpm.h | 30 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 3 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 117 ++- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 16 +- + .../net/ethernet/marvell/octeontx2/nic/Makefile | 3 + + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 25 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 15 + + .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 170 ++++ + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 19 +- + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 50 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 30 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 25 +- + drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 + + .../ethernet/mellanox/mlx5/core/en/tc/act/accept.c | 5 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/act.h | 5 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/csum.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c | 17 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/drop.c | 3 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/goto.c | 12 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/mark.c | 3 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/mirred.c | 7 +- + .../mellanox/mlx5/core/en/tc/act/mirred_nic.c | 3 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/mpls.c | 9 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/pedit.c | 11 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/pedit.h | 1 - + .../ethernet/mellanox/mlx5/core/en/tc/act/ptype.c | 3 +- + .../mlx5/core/en/tc/act/redirect_ingress.c | 8 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/sample.c | 11 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/trap.c | 5 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/tun.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/vlan.c | 13 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/vlan.h | 1 - + .../mellanox/mlx5/core/en/tc/act/vlan_mangle.c | 9 +- + .../ethernet/mellanox/mlx5/core/en/tc/post_act.c | 1 + + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 18 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 87 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 4 - + .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 13 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 17 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 368 +++++---- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 27 +- + .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 16 - + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 33 +- + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 14 + + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 3 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 16 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 7 + + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 11 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 75 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 10 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 77 ++ + .../mellanox/mlxsw/core_acl_flex_actions.h | 3 + + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 121 ++- + drivers/net/ethernet/mellanox/mlxsw/core_env.h | 3 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 3 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 59 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 106 +-- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 32 +- + .../net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c | 5 +- + .../ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c | 12 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 91 ++- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 28 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 6 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 3 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 3 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 2 +- + drivers/net/ethernet/microchip/lan966x/Makefile | 3 +- + .../ethernet/microchip/lan966x/lan966x_ethtool.c | 34 + + .../net/ethernet/microchip/lan966x/lan966x_main.c | 131 ++- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 54 ++ + .../net/ethernet/microchip/lan966x/lan966x_mdb.c | 45 ++ + .../ethernet/microchip/lan966x/lan966x_phylink.c | 9 + + .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 618 ++++++++++++++ + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 121 +++ + .../ethernet/microchip/lan966x/lan966x_switchdev.c | 61 ++ + .../net/ethernet/microchip/sparx5/sparx5_main.c | 2 - + .../net/ethernet/microchip/sparx5/sparx5_phylink.c | 10 + + drivers/net/ethernet/microsoft/mana/gdma_main.c | 4 +- + drivers/net/ethernet/microsoft/mana/mana.h | 15 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 70 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 35 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 81 +- + drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h | 3 +- + drivers/net/ethernet/netronome/nfp/nfp_port.h | 3 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 7 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 17 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 162 ++-- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 6 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 189 +++-- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 125 ++- + .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 37 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 66 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 48 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 30 +- + drivers/net/ethernet/realtek/r8169_main.c | 74 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 71 +- + drivers/net/ethernet/renesas/ravb_main.c | 13 +- + drivers/net/ethernet/renesas/sh_eth.c | 18 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +- + drivers/net/ethernet/sfc/ef10.c | 26 + + drivers/net/ethernet/sfc/ef100_nic.c | 9 + + drivers/net/ethernet/sfc/net_driver.h | 2 + + drivers/net/ethernet/sfc/nic_common.h | 5 + + drivers/net/ethernet/sfc/rx_common.c | 18 +- + drivers/net/ethernet/sfc/rx_common.h | 6 + + drivers/net/ethernet/sfc/siena.c | 8 + + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 30 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 147 ++-- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 22 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 8 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 2 + + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 108 ++- + drivers/net/fjes/fjes_main.c | 5 +- + drivers/net/hyperv/netvsc.c | 24 +- + drivers/net/ipa/gsi_trans.c | 11 + + drivers/net/ipa/gsi_trans.h | 10 + + drivers/net/ipa/ipa_data-v3.1.c | 2 + + drivers/net/ipa/ipa_data-v3.5.1.c | 2 + + drivers/net/ipa/ipa_data-v4.11.c | 2 + + drivers/net/ipa/ipa_data-v4.2.c | 2 + + drivers/net/ipa/ipa_data-v4.5.c | 2 + + drivers/net/ipa/ipa_data-v4.9.c | 2 + + drivers/net/ipa/ipa_data.h | 2 + + drivers/net/ipa/ipa_endpoint.c | 217 +++-- + drivers/net/ipa/ipa_endpoint.h | 8 +- + drivers/net/mdio/mdio-xgene.c | 3 +- + drivers/net/pcs/pcs-xpcs.c | 41 +- + drivers/net/phy/aquantia_main.c | 4 +- + drivers/net/phy/at803x.c | 146 +++- + drivers/net/phy/phy-core.c | 22 +- + drivers/net/phy/phylink.c | 11 - + drivers/net/usb/Kconfig | 1 + + drivers/net/usb/asix.h | 4 +- + drivers/net/usb/asix_common.c | 19 +- + drivers/net/usb/asix_devices.c | 22 +- + drivers/net/usb/cdc_mbim.c | 1 + + drivers/net/usb/smsc95xx.c | 25 + + drivers/nfc/st-nci/vendor_cmds.c | 2 +- + drivers/nfc/st21nfca/vendor_cmds.c | 4 +- + drivers/ptp/ptp_clock.c | 11 +- + drivers/ptp/ptp_pch.c | 195 +---- + drivers/ptp/ptp_sysfs.c | 4 +- + drivers/ptp/ptp_vclock.c | 56 +- + drivers/soc/fsl/dpio/qbman-portal.c | 8 +- + include/linux/bpf.h | 82 +- + include/linux/bpf_verifier.h | 7 + + include/linux/btf.h | 75 +- + include/linux/btf_ids.h | 13 +- + include/linux/dsa/tag_qca.h | 82 ++ + include/linux/ethtool.h | 2 + + include/linux/filter.h | 5 +- + include/linux/ipv6.h | 9 +- + include/linux/linkmode.h | 5 - + include/linux/mii.h | 50 -- + include/linux/mlx5/mlx5_ifc.h | 7 - + include/linux/net/intel/i40e_client.h | 10 - + include/linux/net/intel/iidc.h | 4 + + include/linux/netdevice.h | 72 +- + include/linux/netlink.h | 9 - + include/linux/pcs/pcs-xpcs.h | 3 +- + include/linux/phy.h | 2 +- + include/linux/phylink.h | 1 - + include/linux/ref_tracker.h | 4 + + include/linux/skbuff.h | 44 +- + include/linux/skmsg.h | 11 +- + include/linux/sunrpc/svc_xprt.h | 1 + + include/linux/sunrpc/xprt.h | 1 + + include/linux/udp.h | 5 - + include/linux/uio.h | 17 + + include/net/ax25.h | 12 - + include/net/bluetooth/hci_core.h | 17 + + include/net/bluetooth/mgmt.h | 16 + + include/net/bonding.h | 14 - + include/net/dsa.h | 37 +- + include/net/gro.h | 52 +- + include/net/inet_connection_sock.h | 8 + + include/net/inet_dscp.h | 57 ++ + include/net/inet_timewait_sock.h | 8 +- + include/net/ip.h | 3 +- + include/net/ip_fib.h | 3 +- + include/net/ipv6.h | 21 +- + include/net/ipv6_frag.h | 1 + + include/net/mctp.h | 16 +- + include/net/net_namespace.h | 6 + + include/net/netfilter/nf_conntrack_bpf.h | 23 + + include/net/netns/core.h | 1 + + include/net/netns/ipv4.h | 11 +- + include/net/netns/ipv6.h | 6 +- + include/net/page_pool.h | 82 +- + include/net/pkt_cls.h | 11 + + include/net/pkt_sched.h | 6 - + include/net/request_sock.h | 2 + + include/net/sch_generic.h | 5 - + include/net/sock.h | 28 +- + include/net/tcp.h | 2 +- + include/net/udplite.h | 43 - + include/net/xdp.h | 108 ++- + include/trace/events/mctp.h | 5 +- + include/trace/events/skb.h | 11 + + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/bpf.h | 63 ++ + include/uapi/linux/ethtool_netlink.h | 7 + + include/uapi/linux/ioam6_iptunnel.h | 9 + + include/uapi/linux/mctp.h | 18 + + include/uapi/linux/socket.h | 4 + + init/main.c | 2 + + kernel/bpf/arraymap.c | 4 +- + kernel/bpf/btf.c | 368 ++++++++- + kernel/bpf/cgroup.c | 149 ++-- + kernel/bpf/core.c | 28 +- + kernel/bpf/cpumap.c | 8 +- + kernel/bpf/devmap.c | 3 +- + kernel/bpf/syscall.c | 24 +- + kernel/bpf/verifier.c | 196 +++-- + kernel/trace/bpf_trace.c | 3 + + lib/ref_tracker.c | 19 +- + net/6lowpan/core.c | 1 + + net/ax25/ax25_route.c | 5 +- + net/batman-adv/multicast.c | 2 +- + net/bluetooth/hci_conn.c | 1 + + net/bluetooth/hci_core.c | 5 +- + net/bluetooth/hci_event.c | 89 +- + net/bluetooth/hci_sync.c | 7 +- + net/bluetooth/mgmt.c | 117 ++- + net/bluetooth/msft.c | 170 +++- + net/bpf/test_run.c | 267 +++++- + net/caif/caif_dev.c | 2 +- + net/can/gw.c | 9 +- + net/core/dev.c | 37 +- + net/core/filter.c | 260 +++++- + net/core/gro.c | 16 +- + net/core/link_watch.c | 6 +- + net/core/net_namespace.c | 20 +- + net/core/page_pool.c | 23 +- + net/core/sock.c | 18 +- + net/core/sock_map.c | 77 +- + net/core/sysctl_net_core.c | 14 +- + net/core/xdp.c | 78 +- + net/dccp/dccp.h | 5 - + net/dccp/ipv4.c | 6 - + net/dccp/ipv6.c | 6 - + net/dccp/minisocks.c | 1 + + net/dsa/dsa2.c | 74 +- + net/dsa/dsa_priv.h | 13 + + net/dsa/slave.c | 32 + + net/dsa/switch.c | 55 +- + net/dsa/tag_qca.c | 85 +- + net/ethtool/rings.c | 15 +- + net/hsr/hsr_debugfs.c | 40 +- + net/hsr/hsr_device.c | 10 +- + net/hsr/hsr_forward.c | 7 +- + net/hsr/hsr_framereg.c | 200 +++-- + net/hsr/hsr_framereg.h | 8 +- + net/hsr/hsr_main.h | 14 +- + net/hsr/hsr_netlink.c | 4 +- + net/ieee802154/6lowpan/core.c | 1 + + net/ipv4/bpf_tcp_ca.c | 22 +- + net/ipv4/fib_frontend.c | 30 +- + net/ipv4/fib_lookup.h | 3 +- + net/ipv4/fib_rules.c | 18 +- + net/ipv4/fib_semantics.c | 58 +- + net/ipv4/fib_trie.c | 58 +- + net/ipv4/icmp.c | 91 +-- + net/ipv4/inet_connection_sock.c | 8 +- + net/ipv4/inet_timewait_sock.c | 75 +- + net/ipv4/ip_input.c | 31 +- + net/ipv4/ip_options.c | 31 +- + net/ipv4/ip_output.c | 6 +- + net/ipv4/ipmr.c | 20 +- + net/ipv4/nexthop.c | 12 +- + net/ipv4/proc.c | 4 +- + net/ipv4/route.c | 27 +- + net/ipv4/sysctl_net_ipv4.c | 20 +- + net/ipv4/tcp.c | 3 +- + net/ipv4/tcp_bbr.c | 18 +- + net/ipv4/tcp_cubic.c | 17 +- + net/ipv4/tcp_dctcp.c | 18 +- + net/ipv4/tcp_input.c | 8 +- + net/ipv4/tcp_ipv4.c | 75 +- + net/ipv4/tcp_minisocks.c | 7 +- + net/ipv4/tcp_output.c | 6 +- + net/ipv4/udp.c | 22 +- + net/ipv6/addrconf.c | 145 ++-- + net/ipv6/exthdrs.c | 8 +- + net/ipv6/fib6_rules.c | 30 +- + net/ipv6/icmp.c | 62 +- + net/ipv6/ioam6_iptunnel.c | 59 +- + net/ipv6/ip6_input.c | 2 +- + net/ipv6/ip6_offload.c | 5 +- + net/ipv6/ip6_output.c | 99 +-- + net/ipv6/ip6_tunnel.c | 8 + + net/ipv6/ip6mr.c | 35 +- + net/ipv6/tcp_ipv6.c | 9 +- + net/ipv6/udp.c | 103 ++- + net/mctp/af_mctp.c | 189 ++++- + net/mctp/device.c | 1 + + net/mctp/route.c | 124 ++- + net/mctp/test/route-test.c | 157 +++- + net/mptcp/options.c | 64 +- + net/mptcp/pm_netlink.c | 50 +- + net/netfilter/Makefile | 5 + + net/netfilter/core.c | 3 +- + net/netfilter/nf_conntrack_bpf.c | 257 ++++++ + net/netfilter/nf_conntrack_core.c | 8 + + net/openvswitch/datapath.c | 18 +- + net/openvswitch/datapath.h | 2 - + net/openvswitch/flow.c | 3 +- + net/sched/cls_api.c | 45 +- + net/smc/af_smc.c | 8 +- + net/smc/smc_tx.c | 59 +- + net/smc/smc_tx.h | 3 + + net/sunrpc/auth_gss/auth_gss.c | 10 +- + net/sunrpc/svc_xprt.c | 4 +- + net/sunrpc/xprt.c | 4 +- + net/tipc/msg.h | 23 - + net/tls/tls_sw.c | 3 +- + net/unix/af_unix.c | 250 +++++- + samples/bpf/xdp1_user.c | 8 +- + samples/bpf/xdp_adjust_tail_user.c | 8 +- + samples/bpf/xdp_fwd_user.c | 4 +- + samples/bpf/xdp_router_ipv4_user.c | 10 +- + samples/bpf/xdp_rxq_info_user.c | 18 +- + samples/bpf/xdp_sample_pkts_user.c | 8 +- + samples/bpf/xdp_sample_user.c | 9 +- + samples/bpf/xdp_tx_iptunnel_user.c | 10 +- + samples/bpf/xdpsock_ctrl_proc.c | 2 +- + samples/bpf/xdpsock_user.c | 10 +- + samples/bpf/xsk_fwd.c | 4 +- + scripts/bpf_doc.py | 124 ++- + security/device_cgroup.c | 2 +- + tools/bpf/bpftool/btf.c | 2 +- + tools/bpf/bpftool/cgroup.c | 6 +- + tools/bpf/bpftool/common.c | 44 + + tools/bpf/bpftool/gen.c | 14 +- + tools/bpf/bpftool/link.c | 3 +- + tools/bpf/bpftool/main.c | 9 +- + tools/bpf/bpftool/main.h | 4 + + tools/bpf/bpftool/map.c | 2 +- + tools/bpf/bpftool/net.c | 2 +- + tools/bpf/bpftool/pids.c | 3 +- + tools/bpf/bpftool/prog.c | 30 +- + tools/bpf/bpftool/struct_ops.c | 4 +- + tools/bpf/resolve_btfids/Makefile | 6 +- + tools/include/uapi/linux/bpf.h | 63 ++ + tools/lib/bpf/bpf.c | 9 +- + tools/lib/bpf/bpf.h | 4 + + tools/lib/bpf/bpf_helpers.h | 2 +- + tools/lib/bpf/btf.c | 31 +- + tools/lib/bpf/btf.h | 22 +- + tools/lib/bpf/hashmap.c | 3 +- + tools/lib/bpf/libbpf.c | 19 + + tools/lib/bpf/libbpf.h | 32 +- + tools/lib/bpf/libbpf.map | 5 + + tools/lib/bpf/libbpf_legacy.h | 5 + + tools/lib/bpf/netlink.c | 117 ++- + tools/perf/util/bpf-loader.c | 64 +- + tools/perf/util/bpf_map.c | 28 +- + tools/testing/selftests/bpf/Makefile | 4 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 21 +- + tools/testing/selftests/bpf/config | 5 + + tools/testing/selftests/bpf/prog_tests/bind_perm.c | 20 +- + .../bpf/prog_tests/bpf_iter_setsockopt_unix.c | 100 +++ + .../selftests/bpf/prog_tests/bpf_mod_race.c | 230 ++++++ + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 48 ++ + tools/testing/selftests/bpf/prog_tests/btf.c | 4 + + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 12 +- + .../bpf/prog_tests/cgroup_getset_retval.c | 481 +++++++++++ + .../selftests/bpf/prog_tests/flow_dissector.c | 2 +- + .../testing/selftests/bpf/prog_tests/global_data.c | 2 +- + .../selftests/bpf/prog_tests/global_data_init.c | 2 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 6 + + .../selftests/bpf/prog_tests/sockmap_basic.c | 66 ++ + .../selftests/bpf/prog_tests/sockmap_listen.c | 12 +- + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 4 +- + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 36 +- + .../selftests/bpf/prog_tests/xdp_adjust_frags.c | 104 +++ + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 193 ++++- + .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 137 ++-- + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 64 +- + .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 55 ++ + .../selftests/bpf/progs/bpf_iter_setsockopt_unix.c | 60 ++ + tools/testing/selftests/bpf/progs/bpf_iter_unix.c | 2 +- + tools/testing/selftests/bpf/progs/bpf_mod_race.c | 100 +++ + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 2 + + .../bpf/progs/cgroup_getset_retval_getsockopt.c | 45 ++ + .../bpf/progs/cgroup_getset_retval_setsockopt.c | 52 ++ + .../selftests/bpf/progs/freplace_cls_redirect.c | 12 +- + .../testing/selftests/bpf/progs/kfunc_call_race.c | 14 + + .../testing/selftests/bpf/progs/kfunc_call_test.c | 52 +- + tools/testing/selftests/bpf/progs/ksym_race.c | 13 + + .../testing/selftests/bpf/progs/sample_map_ret0.c | 24 +- + .../selftests/bpf/progs/sockmap_parse_prog.c | 2 - + tools/testing/selftests/bpf/progs/sockopt_sk.c | 32 +- + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 118 +++ + tools/testing/selftests/bpf/progs/test_btf_haskv.c | 3 + + tools/testing/selftests/bpf/progs/test_btf_newkv.c | 3 + + tools/testing/selftests/bpf/progs/test_btf_nokv.c | 12 +- + .../selftests/bpf/progs/test_skb_cgroup_id_kern.c | 12 +- + .../selftests/bpf/progs/test_sockmap_progs_query.c | 24 + + tools/testing/selftests/bpf/progs/test_tc_edt.c | 12 +- + .../bpf/progs/test_tcp_check_syncookie_kern.c | 12 +- + .../bpf/progs/test_xdp_adjust_tail_grow.c | 10 +- + .../bpf/progs/test_xdp_adjust_tail_shrink.c | 32 +- + .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 2 +- + .../selftests/bpf/progs/test_xdp_update_frags.c | 42 + + .../bpf/progs/test_xdp_with_cpumap_frags_helpers.c | 27 + + .../bpf/progs/test_xdp_with_cpumap_helpers.c | 6 + + .../bpf/progs/test_xdp_with_devmap_frags_helpers.c | 27 + + .../bpf/progs/test_xdp_with_devmap_helpers.c | 7 + + tools/testing/selftests/bpf/test_verifier.c | 28 + + tools/testing/selftests/bpf/verifier/calls.c | 75 ++ + tools/testing/selftests/bpf/xdpxceiver.c | 5 +- + tools/testing/selftests/net/fib_rule_tests.sh | 86 +- + tools/testing/selftests/net/fib_tests.sh | 76 ++ + .../selftests/net/forwarding/bridge_vlan_aware.sh | 5 +- + .../net/forwarding/bridge_vlan_unaware.sh | 5 +- + .../selftests/net/forwarding/fib_offload_lib.sh | 12 +- + .../net/forwarding/forwarding.config.sample | 2 + + tools/testing/selftests/net/forwarding/lib.sh | 1 + + tools/testing/selftests/net/forwarding/pedit_ip.sh | 201 +++++ + tools/testing/selftests/net/mptcp/mptcp_join.sh | 900 +++++++++++++-------- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 18 + + tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 81 +- + tools/testing/selftests/net/rtnetlink.sh | 4 +- + tools/testing/selftests/net/timestamping.c | 4 +- + 564 files changed, 17929 insertions(+), 6573 deletions(-) + delete mode 100644 drivers/net/dsa/realtek-smi-core.c + create mode 100644 drivers/net/dsa/realtek/Kconfig + create mode 100644 drivers/net/dsa/realtek/Makefile + create mode 100644 drivers/net/dsa/realtek/realtek-mdio.c + create mode 100644 drivers/net/dsa/realtek/realtek-smi.c + rename drivers/net/dsa/{realtek-smi-core.h => realtek/realtek.h} (55%) + rename drivers/net/dsa/{ => realtek}/rtl8365mb.c (75%) + rename drivers/net/dsa/{rtl8366.c => realtek/rtl8366-core.c} (61%) + rename drivers/net/dsa/{ => realtek}/rtl8366rb.c (78%) + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c + create mode 100644 include/linux/dsa/tag_qca.h + create mode 100644 include/net/inet_dscp.h + create mode 100644 include/net/netfilter/nf_conntrack_bpf.h + create mode 100644 net/netfilter/nf_conntrack_bpf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_iter_setsockopt_unix.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_nf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_getset_retval.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_adjust_frags.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_setsockopt_unix.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_mod_race.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_getset_retval_getsockopt.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_getset_retval_setsockopt.c + create mode 100644 tools/testing/selftests/bpf/progs/kfunc_call_race.c + create mode 100644 tools/testing/selftests/bpf/progs/ksym_race.c + create mode 100644 tools/testing/selftests/bpf/progs/test_bpf_nf.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_progs_query.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_update_frags.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_frags_helpers.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_with_devmap_frags_helpers.c + create mode 100755 tools/testing/selftests/net/forwarding/pedit_ip.sh +$ git reset --hard HEAD^ +HEAD is now at 550e50b8340f Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git +Merging next-20220209 version of net-next +$ git merge -m next-20220209/net-next c3e676b98326a419f30dd5d956c68fc33323f4fd +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Auto-merging drivers/net/dsa/bcm_sf2.c +Auto-merging drivers/net/dsa/mt7530.c +Auto-merging drivers/net/dsa/mv88e6xxx/chip.c +Auto-merging drivers/net/dsa/qca/ar9331.c +Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +Auto-merging drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c +Auto-merging net/dsa/dsa2.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv6/ip6_output.c +Auto-merging net/ipv6/ip6mr.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/net.rst | 9 + + Documentation/bpf/btf.rst | 32 +- + .../devicetree/bindings/net/cdns,macb.yaml | 56 ++ + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 6 + + Documentation/devicetree/bindings/net/fsl-fman.txt | 22 +- + .../bindings/net/microchip,lan966x-switch.yaml | 2 + + Documentation/networking/ethtool-netlink.rst | 8 + + MAINTAINERS | 3 +- + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 + + arch/mips/include/uapi/asm/socket.h | 2 + + arch/parisc/include/uapi/asm/socket.h | 2 + + arch/sparc/include/uapi/asm/socket.h | 2 + + drivers/bluetooth/btintel.c | 11 +- + drivers/bluetooth/btintel.h | 1 + + drivers/bluetooth/btmrvl_debugfs.c | 2 +- + drivers/bluetooth/btmrvl_sdio.c | 2 +- + drivers/bluetooth/btmtk.h | 35 + + drivers/bluetooth/btmtksdio.c | 276 +++++-- + drivers/bluetooth/btrtl.c | 8 + + drivers/bluetooth/btusb.c | 14 +- + drivers/bluetooth/hci_h5.c | 5 + + drivers/bluetooth/hci_ll.c | 2 +- + drivers/bluetooth/hci_serdev.c | 3 +- + drivers/net/bonding/bond_alb.c | 31 +- + drivers/net/dsa/Kconfig | 12 +- + drivers/net/dsa/Makefile | 3 +- + drivers/net/dsa/b53/b53_common.c | 2 +- + drivers/net/dsa/bcm_sf2.c | 54 +- + drivers/net/dsa/microchip/ksz8795.c | 45 +- + drivers/net/dsa/microchip/ksz9477.c | 9 +- + drivers/net/dsa/microchip/ksz_common.c | 6 + + drivers/net/dsa/microchip/ksz_common.h | 1 + + drivers/net/dsa/mt7530.c | 2 +- + drivers/net/dsa/mv88e6xxx/chip.c | 458 +++++++---- + drivers/net/dsa/mv88e6xxx/chip.h | 7 +- + drivers/net/dsa/mv88e6xxx/global1.h | 1 + + drivers/net/dsa/mv88e6xxx/global1_vtu.c | 5 +- + drivers/net/dsa/mv88e6xxx/global2.h | 3 + + drivers/net/dsa/mv88e6xxx/global2_scratch.c | 28 + + drivers/net/dsa/mv88e6xxx/port.c | 7 +- + drivers/net/dsa/mv88e6xxx/port.h | 7 +- + drivers/net/dsa/mv88e6xxx/serdes.c | 43 +- + drivers/net/dsa/mv88e6xxx/smi.c | 35 +- + drivers/net/dsa/qca/ar9331.c | 45 +- + drivers/net/dsa/qca8k.c | 807 +++++++++++++++--- + drivers/net/dsa/qca8k.h | 46 +- + drivers/net/dsa/realtek-smi-core.c | 523 ------------ + drivers/net/dsa/realtek/Kconfig | 40 + + drivers/net/dsa/realtek/Makefile | 6 + + drivers/net/dsa/realtek/realtek-mdio.c | 229 ++++++ + drivers/net/dsa/realtek/realtek-smi.c | 535 ++++++++++++ + .../dsa/{realtek-smi-core.h => realtek/realtek.h} | 80 +- + drivers/net/dsa/{ => realtek}/rtl8365mb.c | 663 ++++++++------- + .../net/dsa/{rtl8366.c => realtek/rtl8366-core.c} | 164 ++-- + drivers/net/dsa/{ => realtek}/rtl8366rb.c | 457 ++++++----- + drivers/net/dsa/xrs700x/xrs700x.c | 29 +- + drivers/net/ethernet/3com/typhoon.c | 24 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 36 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 499 +++++++++++- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 152 +++- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 5 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- + drivers/net/ethernet/cadence/macb.h | 4 + + drivers/net/ethernet/cadence/macb_main.c | 63 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 3 +- + drivers/net/ethernet/cortina/gemini.c | 8 + + drivers/net/ethernet/dec/tulip/pnic.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 60 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 12 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 14 +- + drivers/net/ethernet/freescale/fec_main.c | 2 +- + drivers/net/ethernet/freescale/fec_ptp.c | 1 - + drivers/net/ethernet/freescale/xgmac_mdio.c | 91 ++- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 79 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 6 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 11 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 8 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 11 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 8 + + drivers/net/ethernet/intel/e1000e/netdev.c | 22 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 92 ++- + drivers/net/ethernet/intel/i40e/i40e_common.c | 155 +++- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 3 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 38 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 25 + + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 16 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 9 +- + drivers/net/ethernet/intel/ice/ice_main.c | 2 - + drivers/net/ethernet/intel/ice/ice_txrx.c | 15 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 16 +- + drivers/net/ethernet/intel/igb/igb_main.c | 19 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 22 +- + drivers/net/ethernet/intel/igc/igc_main.c | 32 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 19 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 20 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 27 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 20 +- + drivers/net/ethernet/marvell/mvneta.c | 319 ++++---- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 7 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 3 + + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 19 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 4 + + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 1 + + drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 + + .../ethernet/mellanox/mlx5/core/en/tc/act/accept.c | 5 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/act.h | 5 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/csum.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c | 17 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/drop.c | 3 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/goto.c | 12 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/mark.c | 3 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/mirred.c | 7 +- + .../mellanox/mlx5/core/en/tc/act/mirred_nic.c | 3 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/mpls.c | 9 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/pedit.c | 11 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/pedit.h | 1 - + .../ethernet/mellanox/mlx5/core/en/tc/act/ptype.c | 3 +- + .../mlx5/core/en/tc/act/redirect_ingress.c | 8 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/sample.c | 11 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/trap.c | 5 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/tun.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/vlan.c | 13 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/vlan.h | 1 - + .../mellanox/mlx5/core/en/tc/act/vlan_mangle.c | 9 +- + .../ethernet/mellanox/mlx5/core/en/tc/post_act.c | 1 + + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 18 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 87 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 4 - + .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 13 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 17 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 368 +++++---- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 27 +- + .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 16 - + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 33 +- + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 14 + + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 3 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 16 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 7 + + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 11 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 75 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 10 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 77 ++ + .../mellanox/mlxsw/core_acl_flex_actions.h | 3 + + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 121 ++- + drivers/net/ethernet/mellanox/mlxsw/core_env.h | 3 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 3 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 59 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 106 +-- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 32 +- + .../net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c | 5 +- + .../ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c | 12 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 91 ++- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 28 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 6 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 3 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 3 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 2 +- + drivers/net/ethernet/microchip/lan966x/Makefile | 3 +- + .../ethernet/microchip/lan966x/lan966x_ethtool.c | 34 + + .../net/ethernet/microchip/lan966x/lan966x_main.c | 131 ++- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 54 ++ + .../net/ethernet/microchip/lan966x/lan966x_mdb.c | 45 ++ + .../ethernet/microchip/lan966x/lan966x_phylink.c | 9 + + .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 618 ++++++++++++++ + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 121 +++ + .../ethernet/microchip/lan966x/lan966x_switchdev.c | 61 ++ + .../net/ethernet/microchip/sparx5/sparx5_main.c | 2 - + .../net/ethernet/microchip/sparx5/sparx5_phylink.c | 10 + + drivers/net/ethernet/microsoft/mana/gdma_main.c | 4 +- + drivers/net/ethernet/microsoft/mana/mana.h | 15 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 70 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 35 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 81 +- + drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h | 3 +- + drivers/net/ethernet/netronome/nfp/nfp_port.h | 3 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 7 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 17 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 162 ++-- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 6 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 189 +++-- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 125 ++- + .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 37 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 66 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 48 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 30 +- + drivers/net/ethernet/realtek/r8169_main.c | 74 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 71 +- + drivers/net/ethernet/renesas/ravb_main.c | 13 +- + drivers/net/ethernet/renesas/sh_eth.c | 18 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +- + drivers/net/ethernet/sfc/ef10.c | 26 + + drivers/net/ethernet/sfc/ef100_nic.c | 9 + + drivers/net/ethernet/sfc/net_driver.h | 2 + + drivers/net/ethernet/sfc/nic_common.h | 5 + + drivers/net/ethernet/sfc/rx_common.c | 18 +- + drivers/net/ethernet/sfc/rx_common.h | 6 + + drivers/net/ethernet/sfc/siena.c | 8 + + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 30 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 147 ++-- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 22 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 8 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 2 + + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 108 ++- + drivers/net/fjes/fjes_main.c | 5 +- + drivers/net/ipa/gsi_trans.c | 11 + + drivers/net/ipa/gsi_trans.h | 10 + + drivers/net/ipa/ipa_data-v3.1.c | 2 + + drivers/net/ipa/ipa_data-v3.5.1.c | 2 + + drivers/net/ipa/ipa_data-v4.11.c | 2 + + drivers/net/ipa/ipa_data-v4.2.c | 2 + + drivers/net/ipa/ipa_data-v4.5.c | 2 + + drivers/net/ipa/ipa_data-v4.9.c | 2 + + drivers/net/ipa/ipa_data.h | 2 + + drivers/net/ipa/ipa_endpoint.c | 217 +++-- + drivers/net/ipa/ipa_endpoint.h | 8 +- + drivers/net/mdio/mdio-xgene.c | 3 +- + drivers/net/pcs/pcs-xpcs.c | 41 +- + drivers/net/phy/aquantia_main.c | 4 +- + drivers/net/phy/at803x.c | 146 +++- + drivers/net/phy/phy-core.c | 22 +- + drivers/net/phy/phylink.c | 11 - + drivers/net/usb/asix.h | 4 +- + drivers/net/usb/asix_common.c | 19 +- + drivers/net/usb/asix_devices.c | 22 +- + drivers/net/usb/cdc_mbim.c | 1 + + drivers/nfc/st-nci/vendor_cmds.c | 2 +- + drivers/nfc/st21nfca/vendor_cmds.c | 4 +- + drivers/ptp/ptp_clock.c | 11 +- + drivers/ptp/ptp_sysfs.c | 4 +- + drivers/ptp/ptp_vclock.c | 56 +- + include/linux/bpf.h | 82 +- + include/linux/bpf_verifier.h | 7 + + include/linux/btf.h | 75 +- + include/linux/btf_ids.h | 13 +- + include/linux/dsa/tag_qca.h | 82 ++ + include/linux/ethtool.h | 2 + + include/linux/filter.h | 5 +- + include/linux/ipv6.h | 9 +- + include/linux/linkmode.h | 5 - + include/linux/mii.h | 50 -- + include/linux/mlx5/mlx5_ifc.h | 7 - + include/linux/net/intel/i40e_client.h | 10 - + include/linux/netdevice.h | 69 +- + include/linux/netlink.h | 9 - + include/linux/pcs/pcs-xpcs.h | 3 +- + include/linux/phy.h | 2 +- + include/linux/phylink.h | 1 - + include/linux/ref_tracker.h | 4 + + include/linux/skbuff.h | 44 +- + include/linux/skmsg.h | 11 +- + include/linux/sunrpc/svc_xprt.h | 1 + + include/linux/sunrpc/xprt.h | 1 + + include/linux/udp.h | 5 - + include/linux/uio.h | 17 + + include/net/ax25.h | 12 - + include/net/bluetooth/hci_core.h | 17 + + include/net/bluetooth/mgmt.h | 16 + + include/net/bonding.h | 14 - + include/net/dsa.h | 35 + + include/net/gro.h | 52 +- + include/net/inet_connection_sock.h | 8 + + include/net/inet_dscp.h | 57 ++ + include/net/inet_timewait_sock.h | 8 +- + include/net/ip.h | 3 +- + include/net/ip_fib.h | 3 +- + include/net/ipv6.h | 21 +- + include/net/ipv6_frag.h | 1 + + include/net/net_namespace.h | 6 + + include/net/netfilter/nf_conntrack_bpf.h | 23 + + include/net/netns/core.h | 1 + + include/net/netns/ipv4.h | 11 +- + include/net/netns/ipv6.h | 1 - + include/net/page_pool.h | 82 +- + include/net/pkt_cls.h | 11 + + include/net/pkt_sched.h | 6 - + include/net/request_sock.h | 2 + + include/net/sch_generic.h | 5 - + include/net/sock.h | 28 +- + include/net/tcp.h | 2 +- + include/net/udplite.h | 43 - + include/net/xdp.h | 108 ++- + include/trace/events/skb.h | 11 + + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/bpf.h | 63 ++ + include/uapi/linux/ethtool_netlink.h | 7 + + include/uapi/linux/ioam6_iptunnel.h | 9 + + include/uapi/linux/socket.h | 4 + + init/main.c | 2 + + kernel/bpf/arraymap.c | 4 +- + kernel/bpf/btf.c | 368 ++++++++- + kernel/bpf/cgroup.c | 149 ++-- + kernel/bpf/core.c | 28 +- + kernel/bpf/cpumap.c | 8 +- + kernel/bpf/devmap.c | 3 +- + kernel/bpf/syscall.c | 24 +- + kernel/bpf/verifier.c | 196 +++-- + kernel/trace/bpf_trace.c | 3 + + lib/ref_tracker.c | 19 +- + net/6lowpan/core.c | 1 + + net/ax25/ax25_route.c | 5 +- + net/batman-adv/multicast.c | 2 +- + net/bluetooth/hci_conn.c | 1 + + net/bluetooth/hci_core.c | 5 +- + net/bluetooth/hci_event.c | 89 +- + net/bluetooth/hci_sync.c | 7 +- + net/bluetooth/mgmt.c | 117 ++- + net/bluetooth/msft.c | 170 +++- + net/bpf/test_run.c | 267 +++++- + net/caif/caif_dev.c | 2 +- + net/core/dev.c | 9 +- + net/core/filter.c | 260 +++++- + net/core/gro.c | 16 +- + net/core/link_watch.c | 6 +- + net/core/net_namespace.c | 20 +- + net/core/page_pool.c | 23 +- + net/core/sock.c | 18 +- + net/core/sock_map.c | 77 +- + net/core/sysctl_net_core.c | 14 +- + net/core/xdp.c | 78 +- + net/dccp/dccp.h | 5 - + net/dccp/ipv4.c | 6 - + net/dccp/ipv6.c | 6 - + net/dccp/minisocks.c | 1 + + net/dsa/dsa2.c | 74 +- + net/dsa/dsa_priv.h | 13 + + net/dsa/slave.c | 32 + + net/dsa/switch.c | 55 +- + net/dsa/tag_qca.c | 85 +- + net/ethtool/rings.c | 15 +- + net/hsr/hsr_debugfs.c | 40 +- + net/hsr/hsr_device.c | 10 +- + net/hsr/hsr_forward.c | 7 +- + net/hsr/hsr_framereg.c | 200 +++-- + net/hsr/hsr_framereg.h | 8 +- + net/hsr/hsr_main.h | 14 +- + net/hsr/hsr_netlink.c | 4 +- + net/ieee802154/6lowpan/core.c | 1 + + net/ipv4/bpf_tcp_ca.c | 22 +- + net/ipv4/fib_frontend.c | 11 +- + net/ipv4/fib_lookup.h | 3 +- + net/ipv4/fib_rules.c | 18 +- + net/ipv4/fib_semantics.c | 58 +- + net/ipv4/fib_trie.c | 58 +- + net/ipv4/icmp.c | 91 +-- + net/ipv4/inet_connection_sock.c | 8 +- + net/ipv4/inet_timewait_sock.c | 75 +- + net/ipv4/ip_input.c | 31 +- + net/ipv4/ip_options.c | 31 +- + net/ipv4/ip_output.c | 6 +- + net/ipv4/proc.c | 4 +- + net/ipv4/route.c | 27 +- + net/ipv4/sysctl_net_ipv4.c | 20 +- + net/ipv4/tcp.c | 3 +- + net/ipv4/tcp_bbr.c | 18 +- + net/ipv4/tcp_cubic.c | 17 +- + net/ipv4/tcp_dctcp.c | 18 +- + net/ipv4/tcp_input.c | 8 +- + net/ipv4/tcp_ipv4.c | 75 +- + net/ipv4/tcp_minisocks.c | 7 +- + net/ipv4/tcp_output.c | 6 +- + net/ipv4/udp.c | 22 +- + net/ipv6/addrconf.c | 6 +- + net/ipv6/exthdrs.c | 8 +- + net/ipv6/fib6_rules.c | 19 +- + net/ipv6/icmp.c | 62 +- + net/ipv6/ioam6_iptunnel.c | 59 +- + net/ipv6/ip6_input.c | 2 +- + net/ipv6/ip6_offload.c | 5 +- + net/ipv6/ip6_output.c | 99 +-- + net/ipv6/ip6_tunnel.c | 5 + + net/ipv6/ip6mr.c | 15 +- + net/ipv6/tcp_ipv6.c | 9 +- + net/ipv6/udp.c | 103 ++- + net/mctp/device.c | 1 + + net/mptcp/options.c | 64 +- + net/mptcp/pm_netlink.c | 50 +- + net/netfilter/Makefile | 5 + + net/netfilter/core.c | 3 +- + net/netfilter/nf_conntrack_bpf.c | 257 ++++++ + net/netfilter/nf_conntrack_core.c | 8 + + net/openvswitch/datapath.c | 18 +- + net/openvswitch/datapath.h | 2 - + net/openvswitch/flow.c | 3 +- + net/sched/cls_api.c | 45 +- + net/smc/af_smc.c | 8 +- + net/smc/smc_tx.c | 59 +- + net/smc/smc_tx.h | 3 + + net/sunrpc/auth_gss/auth_gss.c | 10 +- + net/sunrpc/svc_xprt.c | 4 +- + net/sunrpc/xprt.c | 4 +- + net/tipc/msg.h | 23 - + net/tls/tls_sw.c | 3 +- + net/unix/af_unix.c | 250 +++++- + samples/bpf/xdp1_user.c | 8 +- + samples/bpf/xdp_adjust_tail_user.c | 8 +- + samples/bpf/xdp_fwd_user.c | 4 +- + samples/bpf/xdp_router_ipv4_user.c | 10 +- + samples/bpf/xdp_rxq_info_user.c | 18 +- + samples/bpf/xdp_sample_pkts_user.c | 8 +- + samples/bpf/xdp_sample_user.c | 9 +- + samples/bpf/xdp_tx_iptunnel_user.c | 10 +- + samples/bpf/xdpsock_ctrl_proc.c | 2 +- + samples/bpf/xdpsock_user.c | 10 +- + samples/bpf/xsk_fwd.c | 4 +- + scripts/bpf_doc.py | 124 ++- + security/device_cgroup.c | 2 +- + tools/bpf/bpftool/btf.c | 2 +- + tools/bpf/bpftool/cgroup.c | 6 +- + tools/bpf/bpftool/common.c | 44 + + tools/bpf/bpftool/gen.c | 14 +- + tools/bpf/bpftool/link.c | 3 +- + tools/bpf/bpftool/main.c | 9 +- + tools/bpf/bpftool/main.h | 4 + + tools/bpf/bpftool/map.c | 2 +- + tools/bpf/bpftool/net.c | 2 +- + tools/bpf/bpftool/pids.c | 3 +- + tools/bpf/bpftool/prog.c | 30 +- + tools/bpf/bpftool/struct_ops.c | 4 +- + tools/bpf/resolve_btfids/Makefile | 6 +- + tools/include/uapi/linux/bpf.h | 63 ++ + tools/lib/bpf/bpf.c | 9 +- + tools/lib/bpf/bpf.h | 4 + + tools/lib/bpf/bpf_helpers.h | 2 +- + tools/lib/bpf/btf.c | 31 +- + tools/lib/bpf/btf.h | 22 +- + tools/lib/bpf/hashmap.c | 3 +- + tools/lib/bpf/libbpf.c | 19 + + tools/lib/bpf/libbpf.h | 32 +- + tools/lib/bpf/libbpf.map | 5 + + tools/lib/bpf/libbpf_legacy.h | 5 + + tools/lib/bpf/netlink.c | 117 ++- + tools/perf/util/bpf-loader.c | 64 +- + tools/perf/util/bpf_map.c | 28 +- + tools/testing/selftests/bpf/Makefile | 4 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 21 +- + tools/testing/selftests/bpf/config | 5 + + tools/testing/selftests/bpf/prog_tests/bind_perm.c | 20 +- + .../bpf/prog_tests/bpf_iter_setsockopt_unix.c | 100 +++ + .../selftests/bpf/prog_tests/bpf_mod_race.c | 230 ++++++ + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 48 ++ + tools/testing/selftests/bpf/prog_tests/btf.c | 4 + + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 12 +- + .../bpf/prog_tests/cgroup_getset_retval.c | 481 +++++++++++ + .../selftests/bpf/prog_tests/flow_dissector.c | 2 +- + .../testing/selftests/bpf/prog_tests/global_data.c | 2 +- + .../selftests/bpf/prog_tests/global_data_init.c | 2 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 6 + + .../selftests/bpf/prog_tests/sockmap_basic.c | 66 ++ + .../selftests/bpf/prog_tests/sockmap_listen.c | 12 +- + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 4 +- + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 36 +- + .../selftests/bpf/prog_tests/xdp_adjust_frags.c | 104 +++ + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 193 ++++- + .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 137 ++-- + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 64 +- + .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 55 ++ + .../selftests/bpf/progs/bpf_iter_setsockopt_unix.c | 60 ++ + tools/testing/selftests/bpf/progs/bpf_iter_unix.c | 2 +- + tools/testing/selftests/bpf/progs/bpf_mod_race.c | 100 +++ + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 2 + + .../bpf/progs/cgroup_getset_retval_getsockopt.c | 45 ++ + .../bpf/progs/cgroup_getset_retval_setsockopt.c | 52 ++ + .../selftests/bpf/progs/freplace_cls_redirect.c | 12 +- + .../testing/selftests/bpf/progs/kfunc_call_race.c | 14 + + .../testing/selftests/bpf/progs/kfunc_call_test.c | 52 +- + tools/testing/selftests/bpf/progs/ksym_race.c | 13 + + .../testing/selftests/bpf/progs/sample_map_ret0.c | 24 +- + .../selftests/bpf/progs/sockmap_parse_prog.c | 2 - + tools/testing/selftests/bpf/progs/sockopt_sk.c | 32 +- + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 118 +++ + tools/testing/selftests/bpf/progs/test_btf_haskv.c | 3 + + tools/testing/selftests/bpf/progs/test_btf_newkv.c | 3 + + tools/testing/selftests/bpf/progs/test_btf_nokv.c | 12 +- + .../selftests/bpf/progs/test_skb_cgroup_id_kern.c | 12 +- + .../selftests/bpf/progs/test_sockmap_progs_query.c | 24 + + tools/testing/selftests/bpf/progs/test_tc_edt.c | 12 +- + .../bpf/progs/test_tcp_check_syncookie_kern.c | 12 +- + .../bpf/progs/test_xdp_adjust_tail_grow.c | 10 +- + .../bpf/progs/test_xdp_adjust_tail_shrink.c | 32 +- + .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 2 +- + .../selftests/bpf/progs/test_xdp_update_frags.c | 42 + + .../bpf/progs/test_xdp_with_cpumap_frags_helpers.c | 27 + + .../bpf/progs/test_xdp_with_cpumap_helpers.c | 6 + + .../bpf/progs/test_xdp_with_devmap_frags_helpers.c | 27 + + .../bpf/progs/test_xdp_with_devmap_helpers.c | 7 + + tools/testing/selftests/bpf/test_verifier.c | 28 + + tools/testing/selftests/bpf/verifier/calls.c | 75 ++ + tools/testing/selftests/bpf/xdpxceiver.c | 5 +- + tools/testing/selftests/net/fib_rule_tests.sh | 86 +- + tools/testing/selftests/net/fib_tests.sh | 76 ++ + .../selftests/net/forwarding/bridge_vlan_aware.sh | 5 +- + .../net/forwarding/bridge_vlan_unaware.sh | 5 +- + .../selftests/net/forwarding/fib_offload_lib.sh | 12 +- + .../net/forwarding/forwarding.config.sample | 2 + + tools/testing/selftests/net/forwarding/lib.sh | 1 + + tools/testing/selftests/net/forwarding/pedit_ip.sh | 201 +++++ + tools/testing/selftests/net/mptcp/mptcp_join.sh | 900 +++++++++++++-------- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 18 + + tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 81 +- + tools/testing/selftests/net/rtnetlink.sh | 4 +- + tools/testing/selftests/net/timestamping.c | 4 +- + 520 files changed, 15889 insertions(+), 5871 deletions(-) + delete mode 100644 drivers/net/dsa/realtek-smi-core.c + create mode 100644 drivers/net/dsa/realtek/Kconfig + create mode 100644 drivers/net/dsa/realtek/Makefile + create mode 100644 drivers/net/dsa/realtek/realtek-mdio.c + create mode 100644 drivers/net/dsa/realtek/realtek-smi.c + rename drivers/net/dsa/{realtek-smi-core.h => realtek/realtek.h} (55%) + rename drivers/net/dsa/{ => realtek}/rtl8365mb.c (75%) + rename drivers/net/dsa/{rtl8366.c => realtek/rtl8366-core.c} (61%) + rename drivers/net/dsa/{ => realtek}/rtl8366rb.c (78%) + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c + create mode 100644 include/linux/dsa/tag_qca.h + create mode 100644 include/net/inet_dscp.h + create mode 100644 include/net/netfilter/nf_conntrack_bpf.h + create mode 100644 net/netfilter/nf_conntrack_bpf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_iter_setsockopt_unix.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_nf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_getset_retval.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_adjust_frags.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_setsockopt_unix.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_mod_race.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_getset_retval_getsockopt.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_getset_retval_setsockopt.c + create mode 100644 tools/testing/selftests/bpf/progs/kfunc_call_race.c + create mode 100644 tools/testing/selftests/bpf/progs/ksym_race.c + create mode 100644 tools/testing/selftests/bpf/progs/test_bpf_nf.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_progs_query.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_update_frags.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_frags_helpers.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_with_devmap_frags_helpers.c + create mode 100755 tools/testing/selftests/net/forwarding/pedit_ip.sh +Merging bpf-next/for-next (e5313968c41b Merge branch 'Split bpf_sk_lookup remote_port field') +$ 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 +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/net/bpf_jit_comp.c +Auto-merging arch/x86/Kconfig +Auto-merging drivers/net/ethernet/intel/i40e/i40e_txrx.h +Auto-merging drivers/net/ethernet/intel/i40e/i40e_xsk.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/intel/ice/ice_txrx.c +Auto-merging drivers/net/ethernet/intel/ice/ice_xsk.c +Auto-merging include/linux/skmsg.h +Auto-merging kernel/bpf/trampoline.c +Auto-merging net/core/filter.c +Merge made by the 'ort' strategy. + Documentation/bpf/btf.rst | 13 + + Documentation/bpf/instruction-set.rst | 215 ++++++++--- + MAINTAINERS | 2 + + arch/arm64/net/bpf_jit_comp.c | 5 + + arch/powerpc/net/bpf_jit_comp.c | 2 +- + arch/sparc/net/bpf_jit_comp_64.c | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/text-patching.h | 1 + + arch/x86/kernel/alternative.c | 34 ++ + arch/x86/net/bpf_jit_comp.c | 70 ++-- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 11 - + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 + + drivers/net/ethernet/intel/ice/ice_main.c | 4 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 6 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 10 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 15 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 374 ++++++++++++------ + drivers/net/ethernet/intel/ice/ice_xsk.h | 27 +- + include/linux/bpf-cgroup.h | 24 +- + include/linux/bpf.h | 40 +- + include/linux/btf.h | 10 + + include/linux/compiler_types.h | 3 + + include/linux/filter.h | 27 +- + include/linux/skmsg.h | 5 - + include/net/xdp_sock_drv.h | 5 +- + include/net/xsk_buff_pool.h | 1 + + include/uapi/linux/bpf.h | 17 +- + init/Kconfig | 4 + + kernel/bpf/bpf_iter.c | 20 +- + kernel/bpf/btf.c | 183 ++++++++- + kernel/bpf/cgroup.c | 30 -- + kernel/bpf/core.c | 289 ++++++++++++-- + kernel/bpf/helpers.c | 34 ++ + kernel/bpf/preload/Makefile | 28 +- + kernel/bpf/preload/iterators/Makefile | 6 +- + kernel/bpf/preload/iterators/iterators.c | 28 +- + kernel/bpf/preload/iterators/iterators.lskel.h | 428 +++++++++++++++++++++ + kernel/bpf/preload/iterators/iterators.skel.h | 412 -------------------- + kernel/bpf/trampoline.c | 6 +- + kernel/bpf/verifier.c | 36 +- + kernel/trace/bpf_trace.c | 2 + + lib/Kconfig.debug | 12 +- + net/bpf/bpf_dummy_struct_ops.c | 6 +- + net/bpf/test_run.c | 18 +- + net/core/filter.c | 13 +- + net/ipv4/bpf_tcp_ca.c | 6 +- + net/xdp/xsk.c | 13 +- + net/xdp/xsk_buff_pool.c | 7 + + net/xdp/xsk_queue.h | 19 +- + samples/bpf/map_perf_test_user.c | 2 +- + samples/bpf/xdp1_user.c | 16 +- + samples/bpf/xdp_adjust_tail_user.c | 17 +- + samples/bpf/xdp_fwd_user.c | 15 +- + samples/bpf/xdp_redirect_cpu.bpf.c | 8 +- + samples/bpf/xdp_redirect_cpu_user.c | 2 +- + samples/bpf/xdp_redirect_map.bpf.c | 2 +- + samples/bpf/xdp_redirect_map_multi.bpf.c | 2 +- + samples/bpf/xdp_router_ipv4_user.c | 17 +- + samples/bpf/xdp_rxq_info_user.c | 16 +- + samples/bpf/xdp_sample_user.c | 2 +- + samples/bpf/xdp_sample_user.h | 2 +- + samples/bpf/xdp_tx_iptunnel_user.c | 17 +- + scripts/pahole-flags.sh | 2 +- + scripts/pahole-version.sh | 13 + + tools/bpf/bpftool/common.c | 2 +- + tools/bpf/bpftool/feature.c | 29 +- + tools/bpf/bpftool/gen.c | 9 +- + tools/bpf/bpftool/main.c | 5 +- + tools/bpf/bpftool/prog.c | 13 +- + tools/include/uapi/linux/bpf.h | 17 +- + tools/lib/bpf/Makefile | 4 +- + tools/lib/bpf/bpf.h | 4 +- + tools/lib/bpf/bpf_tracing.h | 103 ++++- + tools/lib/bpf/btf.h | 12 +- + tools/lib/bpf/btf_dump.c | 6 +- + tools/lib/bpf/libbpf.c | 51 +-- + tools/lib/bpf/libbpf.h | 41 +- + tools/lib/bpf/libbpf.map | 2 + + tools/lib/bpf/libbpf_internal.h | 3 + + tools/lib/bpf/libbpf_legacy.h | 17 + + tools/lib/bpf/skel_internal.h | 70 +++- + tools/perf/tests/llvm.c | 2 +- + tools/perf/util/bpf-loader.c | 10 +- + tools/testing/selftests/bpf/Makefile | 2 +- + tools/testing/selftests/bpf/README.rst | 2 + + .../testing/selftests/bpf/benchs/bench_ringbufs.c | 2 +- + tools/testing/selftests/bpf/benchs/bench_trigger.c | 6 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 25 ++ + tools/testing/selftests/bpf/prog_tests/atomics.c | 72 ++-- + .../selftests/bpf/prog_tests/attach_probe.c | 18 +- + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 16 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 20 + + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 10 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 21 +- + tools/testing/selftests/bpf/prog_tests/btf_tag.c | 101 ++++- + tools/testing/selftests/bpf/prog_tests/check_mtu.c | 40 +- + .../selftests/bpf/prog_tests/cls_redirect.c | 10 +- + tools/testing/selftests/bpf/prog_tests/core_kern.c | 16 +- + .../selftests/bpf/prog_tests/core_kern_overflow.c | 13 + + .../selftests/bpf/prog_tests/dummy_st_ops.c | 27 +- + .../selftests/bpf/prog_tests/fentry_fexit.c | 24 +- + .../testing/selftests/bpf/prog_tests/fentry_test.c | 7 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 34 +- + .../selftests/bpf/prog_tests/fexit_stress.c | 22 +- + .../testing/selftests/bpf/prog_tests/fexit_test.c | 7 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 31 +- + .../bpf/prog_tests/flow_dissector_load_bytes.c | 24 +- + tools/testing/selftests/bpf/prog_tests/for_each.c | 32 +- + .../selftests/bpf/prog_tests/get_func_args_test.c | 12 +- + .../selftests/bpf/prog_tests/get_func_ip_test.c | 10 +- + .../bpf/prog_tests/get_stackid_cannot_attach.c | 2 +- + .../testing/selftests/bpf/prog_tests/global_data.c | 24 +- + .../selftests/bpf/prog_tests/global_func_args.c | 14 +- + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 16 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 46 ++- + .../selftests/bpf/prog_tests/ksyms_module.c | 27 +- + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 35 +- + tools/testing/selftests/bpf/prog_tests/log_buf.c | 2 +- + tools/testing/selftests/bpf/prog_tests/map_lock.c | 15 +- + tools/testing/selftests/bpf/prog_tests/map_ptr.c | 16 +- + .../selftests/bpf/prog_tests/modify_return.c | 33 +- + .../testing/selftests/bpf/prog_tests/pkt_access.c | 26 +- + .../selftests/bpf/prog_tests/pkt_md_access.c | 14 +- + .../selftests/bpf/prog_tests/prog_run_opts.c | 77 ++++ + .../selftests/bpf/prog_tests/prog_run_xattr.c | 83 ---- + .../selftests/bpf/prog_tests/queue_stack_map.c | 46 ++- + .../selftests/bpf/prog_tests/raw_tp_test_run.c | 64 ++- + .../bpf/prog_tests/raw_tp_writable_test_run.c | 16 +- + .../selftests/bpf/prog_tests/signal_pending.c | 23 +- + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 81 ++-- + .../testing/selftests/bpf/prog_tests/skb_helpers.c | 16 +- + .../testing/selftests/bpf/prog_tests/sock_fields.c | 58 ++- + .../selftests/bpf/prog_tests/sockmap_basic.c | 20 +- + tools/testing/selftests/bpf/prog_tests/spinlock.c | 14 +- + .../bpf/prog_tests/stacktrace_build_id_nmi.c | 2 +- + tools/testing/selftests/bpf/prog_tests/syscall.c | 10 +- + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 238 ++++++------ + .../selftests/bpf/prog_tests/task_pt_regs.c | 16 +- + .../bpf/prog_tests/test_bpf_syscall_macro.c | 73 ++++ + .../selftests/bpf/prog_tests/test_profiler.c | 14 +- + .../selftests/bpf/prog_tests/test_skb_pkt_end.c | 15 +- + tools/testing/selftests/bpf/prog_tests/timer.c | 7 +- + tools/testing/selftests/bpf/prog_tests/timer_mim.c | 7 +- + tools/testing/selftests/bpf/prog_tests/trace_ext.c | 28 +- + tools/testing/selftests/bpf/prog_tests/xdp.c | 34 +- + .../selftests/bpf/prog_tests/xdp_adjust_frags.c | 34 +- + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 126 +++--- + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 29 +- + .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 14 +- + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 12 +- + .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 10 +- + tools/testing/selftests/bpf/prog_tests/xdp_info.c | 14 +- + tools/testing/selftests/bpf/prog_tests/xdp_link.c | 26 +- + .../selftests/bpf/prog_tests/xdp_noinline.c | 44 ++- + tools/testing/selftests/bpf/prog_tests/xdp_perf.c | 19 +- + .../selftests/bpf/progs/bloom_filter_bench.c | 7 +- + .../testing/selftests/bpf/progs/bloom_filter_map.c | 5 +- + tools/testing/selftests/bpf/progs/bpf_iter_task.c | 54 +++ + tools/testing/selftests/bpf/progs/bpf_loop.c | 9 +- + tools/testing/selftests/bpf/progs/bpf_loop_bench.c | 3 +- + tools/testing/selftests/bpf/progs/bpf_misc.h | 19 + + .../selftests/bpf/progs/bpf_syscall_macro.c | 84 ++++ + .../selftests/bpf/progs/btf_type_tag_user.c | 40 ++ + tools/testing/selftests/bpf/progs/core_kern.c | 16 + + .../selftests/bpf/progs/core_kern_overflow.c | 22 ++ + tools/testing/selftests/bpf/progs/fexit_sleep.c | 9 +- + tools/testing/selftests/bpf/progs/perfbuf_bench.c | 3 +- + tools/testing/selftests/bpf/progs/ringbuf_bench.c | 3 +- + tools/testing/selftests/bpf/progs/sockopt_sk.c | 3 +- + .../progs/{btf_decl_tag.c => test_btf_decl_tag.c} | 0 + .../testing/selftests/bpf/progs/test_probe_user.c | 15 +- + tools/testing/selftests/bpf/progs/test_ringbuf.c | 3 +- + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 6 + + .../testing/selftests/bpf/progs/test_sock_fields.c | 41 ++ + .../bpf/progs/test_xdp_with_cpumap_frags_helpers.c | 2 +- + .../bpf/progs/test_xdp_with_cpumap_helpers.c | 2 +- + .../bpf/progs/test_xdp_with_devmap_frags_helpers.c | 2 +- + .../bpf/progs/test_xdp_with_devmap_helpers.c | 2 +- + tools/testing/selftests/bpf/progs/trace_printk.c | 3 +- + tools/testing/selftests/bpf/progs/trace_vprintk.c | 3 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 9 +- + .../selftests/bpf/progs/xdp_redirect_multi_kern.c | 2 +- + tools/testing/selftests/bpf/test_lru_map.c | 11 +- + tools/testing/selftests/bpf/test_lwt_seg6local.sh | 170 ++++---- + tools/testing/selftests/bpf/test_maps.c | 2 +- + .../selftests/bpf/test_tcp_check_syncookie.sh | 5 +- + tools/testing/selftests/bpf/test_verifier.c | 20 +- + tools/testing/selftests/bpf/test_xdp_meta.sh | 38 +- + tools/testing/selftests/bpf/test_xdp_redirect.sh | 30 +- + .../selftests/bpf/test_xdp_redirect_multi.sh | 60 +-- + tools/testing/selftests/bpf/test_xdp_veth.sh | 39 +- + tools/testing/selftests/bpf/test_xdp_vlan.sh | 66 ++-- + tools/testing/selftests/bpf/trace_helpers.c | 70 ++-- + tools/testing/selftests/bpf/trace_helpers.h | 3 +- + tools/testing/selftests/bpf/verifier/sock.c | 81 +++- + tools/testing/selftests/bpf/xdp_redirect_multi.c | 8 +- + tools/testing/selftests/bpf/xdping.c | 4 +- + tools/testing/selftests/bpf/xdpxceiver.c | 80 ++-- + tools/testing/selftests/bpf/xdpxceiver.h | 2 +- + 201 files changed, 4049 insertions(+), 2215 deletions(-) + create mode 100644 kernel/bpf/preload/iterators/iterators.lskel.h + delete mode 100644 kernel/bpf/preload/iterators/iterators.skel.h + create mode 100755 scripts/pahole-version.sh + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_kern_overflow.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/prog_run_opts.c + delete mode 100644 tools/testing/selftests/bpf/prog_tests/prog_run_xattr.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_bpf_syscall_macro.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_misc.h + create mode 100644 tools/testing/selftests/bpf/progs/bpf_syscall_macro.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_type_tag_user.c + create mode 100644 tools/testing/selftests/bpf/progs/core_kern_overflow.c + rename tools/testing/selftests/bpf/progs/{btf_decl_tag.c => test_btf_decl_tag.c} (100%) +$ git reset --hard HEAD^ +HEAD is now at 8b1d1312d178 next-20220209/net-next +Merging next-20220208 version of bpf-next +$ git merge -m next-20220208/bpf-next 128dac5f21e950746aae3c1ef6df87e231d288a3 +Auto-merging MAINTAINERS +Auto-merging drivers/net/ethernet/intel/i40e/i40e_txrx.h +Auto-merging drivers/net/ethernet/intel/i40e/i40e_xsk.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/intel/ice/ice_txrx.c +Auto-merging drivers/net/ethernet/intel/ice/ice_xsk.c +Auto-merging include/linux/skmsg.h +Auto-merging net/core/filter.c +Merge made by the 'ort' strategy. + Documentation/bpf/btf.rst | 13 + + Documentation/bpf/instruction-set.rst | 215 ++++++++--- + MAINTAINERS | 2 + + arch/arm64/net/bpf_jit_comp.c | 5 + + arch/x86/net/bpf_jit_comp.c | 1 - + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 11 - + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 + + drivers/net/ethernet/intel/ice/ice_main.c | 4 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 6 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 10 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 15 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 374 ++++++++++++------ + drivers/net/ethernet/intel/ice/ice_xsk.h | 27 +- + include/linux/bpf-cgroup.h | 24 +- + include/linux/bpf.h | 33 +- + include/linux/btf.h | 10 + + include/linux/compiler_types.h | 3 + + include/linux/skmsg.h | 5 - + include/net/xdp_sock_drv.h | 5 +- + include/net/xsk_buff_pool.h | 1 + + include/uapi/linux/bpf.h | 14 +- + init/Kconfig | 4 + + kernel/bpf/bpf_iter.c | 20 +- + kernel/bpf/btf.c | 183 ++++++++- + kernel/bpf/cgroup.c | 30 -- + kernel/bpf/core.c | 16 +- + kernel/bpf/helpers.c | 34 ++ + kernel/bpf/preload/Makefile | 28 +- + kernel/bpf/preload/iterators/Makefile | 6 +- + kernel/bpf/preload/iterators/iterators.c | 28 +- + kernel/bpf/preload/iterators/iterators.lskel.h | 428 +++++++++++++++++++++ + kernel/bpf/preload/iterators/iterators.skel.h | 412 -------------------- + kernel/bpf/verifier.c | 35 +- + kernel/trace/bpf_trace.c | 2 + + lib/Kconfig.debug | 12 +- + net/bpf/bpf_dummy_struct_ops.c | 6 +- + net/bpf/test_run.c | 5 + + net/core/filter.c | 10 +- + net/ipv4/bpf_tcp_ca.c | 6 +- + net/xdp/xsk.c | 13 +- + net/xdp/xsk_buff_pool.c | 7 + + net/xdp/xsk_queue.h | 19 +- + samples/bpf/map_perf_test_user.c | 2 +- + samples/bpf/xdp1_user.c | 16 +- + samples/bpf/xdp_adjust_tail_user.c | 17 +- + samples/bpf/xdp_fwd_user.c | 15 +- + samples/bpf/xdp_redirect_cpu.bpf.c | 8 +- + samples/bpf/xdp_redirect_cpu_user.c | 2 +- + samples/bpf/xdp_redirect_map.bpf.c | 2 +- + samples/bpf/xdp_redirect_map_multi.bpf.c | 2 +- + samples/bpf/xdp_router_ipv4_user.c | 17 +- + samples/bpf/xdp_rxq_info_user.c | 16 +- + samples/bpf/xdp_sample_user.c | 2 +- + samples/bpf/xdp_sample_user.h | 2 +- + samples/bpf/xdp_tx_iptunnel_user.c | 17 +- + scripts/pahole-flags.sh | 2 +- + scripts/pahole-version.sh | 13 + + tools/bpf/bpftool/common.c | 2 +- + tools/bpf/bpftool/feature.c | 29 +- + tools/bpf/bpftool/gen.c | 9 +- + tools/bpf/bpftool/main.c | 5 +- + tools/bpf/bpftool/prog.c | 13 +- + tools/include/uapi/linux/bpf.h | 14 +- + tools/lib/bpf/Makefile | 4 +- + tools/lib/bpf/bpf.h | 4 +- + tools/lib/bpf/bpf_tracing.h | 34 ++ + tools/lib/bpf/btf.h | 12 +- + tools/lib/bpf/libbpf.c | 51 +-- + tools/lib/bpf/libbpf.h | 41 +- + tools/lib/bpf/libbpf.map | 2 + + tools/lib/bpf/libbpf_internal.h | 3 + + tools/lib/bpf/libbpf_legacy.h | 17 + + tools/lib/bpf/skel_internal.h | 70 +++- + tools/perf/tests/llvm.c | 2 +- + tools/perf/util/bpf-loader.c | 10 +- + tools/testing/selftests/bpf/Makefile | 2 +- + tools/testing/selftests/bpf/README.rst | 2 + + .../testing/selftests/bpf/benchs/bench_ringbufs.c | 2 +- + tools/testing/selftests/bpf/benchs/bench_trigger.c | 6 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 25 ++ + tools/testing/selftests/bpf/prog_tests/atomics.c | 72 ++-- + .../selftests/bpf/prog_tests/attach_probe.c | 18 +- + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 16 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 20 + + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 10 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 21 +- + tools/testing/selftests/bpf/prog_tests/btf_tag.c | 101 ++++- + tools/testing/selftests/bpf/prog_tests/check_mtu.c | 40 +- + .../selftests/bpf/prog_tests/cls_redirect.c | 10 +- + tools/testing/selftests/bpf/prog_tests/core_kern.c | 16 +- + .../selftests/bpf/prog_tests/core_kern_overflow.c | 13 + + .../selftests/bpf/prog_tests/dummy_st_ops.c | 27 +- + .../selftests/bpf/prog_tests/fentry_fexit.c | 24 +- + .../testing/selftests/bpf/prog_tests/fentry_test.c | 7 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 34 +- + .../selftests/bpf/prog_tests/fexit_stress.c | 22 +- + .../testing/selftests/bpf/prog_tests/fexit_test.c | 7 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 31 +- + .../bpf/prog_tests/flow_dissector_load_bytes.c | 24 +- + tools/testing/selftests/bpf/prog_tests/for_each.c | 32 +- + .../selftests/bpf/prog_tests/get_func_args_test.c | 12 +- + .../selftests/bpf/prog_tests/get_func_ip_test.c | 10 +- + .../bpf/prog_tests/get_stackid_cannot_attach.c | 2 +- + .../testing/selftests/bpf/prog_tests/global_data.c | 24 +- + .../selftests/bpf/prog_tests/global_func_args.c | 14 +- + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 16 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 46 ++- + .../selftests/bpf/prog_tests/ksyms_module.c | 23 +- + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 35 +- + tools/testing/selftests/bpf/prog_tests/log_buf.c | 2 +- + tools/testing/selftests/bpf/prog_tests/map_lock.c | 15 +- + tools/testing/selftests/bpf/prog_tests/map_ptr.c | 16 +- + .../selftests/bpf/prog_tests/modify_return.c | 33 +- + .../testing/selftests/bpf/prog_tests/pkt_access.c | 26 +- + .../selftests/bpf/prog_tests/pkt_md_access.c | 14 +- + .../selftests/bpf/prog_tests/prog_run_opts.c | 77 ++++ + .../selftests/bpf/prog_tests/prog_run_xattr.c | 83 ---- + .../selftests/bpf/prog_tests/queue_stack_map.c | 46 ++- + .../selftests/bpf/prog_tests/raw_tp_test_run.c | 64 ++- + .../bpf/prog_tests/raw_tp_writable_test_run.c | 16 +- + .../selftests/bpf/prog_tests/signal_pending.c | 23 +- + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 81 ++-- + .../testing/selftests/bpf/prog_tests/skb_helpers.c | 16 +- + .../testing/selftests/bpf/prog_tests/sock_fields.c | 58 ++- + .../selftests/bpf/prog_tests/sockmap_basic.c | 20 +- + tools/testing/selftests/bpf/prog_tests/spinlock.c | 14 +- + .../bpf/prog_tests/stacktrace_build_id_nmi.c | 2 +- + tools/testing/selftests/bpf/prog_tests/syscall.c | 10 +- + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 238 ++++++------ + .../selftests/bpf/prog_tests/task_pt_regs.c | 16 +- + .../bpf/prog_tests/test_bpf_syscall_macro.c | 63 +++ + .../selftests/bpf/prog_tests/test_profiler.c | 14 +- + .../selftests/bpf/prog_tests/test_skb_pkt_end.c | 15 +- + tools/testing/selftests/bpf/prog_tests/timer.c | 7 +- + tools/testing/selftests/bpf/prog_tests/timer_mim.c | 7 +- + tools/testing/selftests/bpf/prog_tests/trace_ext.c | 28 +- + tools/testing/selftests/bpf/prog_tests/xdp.c | 34 +- + .../selftests/bpf/prog_tests/xdp_adjust_frags.c | 32 +- + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 122 +++--- + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 29 +- + .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 14 +- + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 8 +- + .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 8 +- + tools/testing/selftests/bpf/prog_tests/xdp_info.c | 14 +- + tools/testing/selftests/bpf/prog_tests/xdp_link.c | 26 +- + .../selftests/bpf/prog_tests/xdp_noinline.c | 44 ++- + tools/testing/selftests/bpf/prog_tests/xdp_perf.c | 19 +- + .../selftests/bpf/progs/bloom_filter_bench.c | 7 +- + .../testing/selftests/bpf/progs/bloom_filter_map.c | 5 +- + tools/testing/selftests/bpf/progs/bpf_iter_task.c | 54 +++ + tools/testing/selftests/bpf/progs/bpf_loop.c | 9 +- + tools/testing/selftests/bpf/progs/bpf_loop_bench.c | 3 +- + tools/testing/selftests/bpf/progs/bpf_misc.h | 19 + + .../selftests/bpf/progs/bpf_syscall_macro.c | 56 +++ + .../selftests/bpf/progs/btf_type_tag_user.c | 40 ++ + tools/testing/selftests/bpf/progs/core_kern.c | 16 + + .../selftests/bpf/progs/core_kern_overflow.c | 22 ++ + tools/testing/selftests/bpf/progs/fexit_sleep.c | 9 +- + tools/testing/selftests/bpf/progs/perfbuf_bench.c | 3 +- + tools/testing/selftests/bpf/progs/ringbuf_bench.c | 3 +- + tools/testing/selftests/bpf/progs/sockopt_sk.c | 3 +- + .../progs/{btf_decl_tag.c => test_btf_decl_tag.c} | 0 + .../testing/selftests/bpf/progs/test_probe_user.c | 15 +- + tools/testing/selftests/bpf/progs/test_ringbuf.c | 3 +- + .../testing/selftests/bpf/progs/test_sock_fields.c | 41 ++ + .../bpf/progs/test_xdp_with_cpumap_frags_helpers.c | 2 +- + .../bpf/progs/test_xdp_with_cpumap_helpers.c | 2 +- + .../bpf/progs/test_xdp_with_devmap_frags_helpers.c | 2 +- + .../bpf/progs/test_xdp_with_devmap_helpers.c | 2 +- + tools/testing/selftests/bpf/progs/trace_printk.c | 3 +- + tools/testing/selftests/bpf/progs/trace_vprintk.c | 3 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 9 +- + .../selftests/bpf/progs/xdp_redirect_multi_kern.c | 2 +- + tools/testing/selftests/bpf/test_lru_map.c | 11 +- + tools/testing/selftests/bpf/test_lwt_seg6local.sh | 170 ++++---- + tools/testing/selftests/bpf/test_maps.c | 2 +- + .../selftests/bpf/test_tcp_check_syncookie.sh | 5 +- + tools/testing/selftests/bpf/test_verifier.c | 20 +- + tools/testing/selftests/bpf/test_xdp_meta.sh | 38 +- + tools/testing/selftests/bpf/test_xdp_redirect.sh | 30 +- + .../selftests/bpf/test_xdp_redirect_multi.sh | 60 +-- + tools/testing/selftests/bpf/test_xdp_veth.sh | 39 +- + tools/testing/selftests/bpf/test_xdp_vlan.sh | 66 ++-- + tools/testing/selftests/bpf/trace_helpers.c | 70 ++-- + tools/testing/selftests/bpf/trace_helpers.h | 3 +- + tools/testing/selftests/bpf/verifier/sock.c | 81 +++- + tools/testing/selftests/bpf/xdp_redirect_multi.c | 8 +- + tools/testing/selftests/bpf/xdping.c | 4 +- + tools/testing/selftests/bpf/xdpxceiver.c | 80 ++-- + tools/testing/selftests/bpf/xdpxceiver.h | 2 +- + 192 files changed, 3554 insertions(+), 2130 deletions(-) + create mode 100644 kernel/bpf/preload/iterators/iterators.lskel.h + delete mode 100644 kernel/bpf/preload/iterators/iterators.skel.h + create mode 100755 scripts/pahole-version.sh + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_kern_overflow.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/prog_run_opts.c + delete mode 100644 tools/testing/selftests/bpf/prog_tests/prog_run_xattr.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_bpf_syscall_macro.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_misc.h + create mode 100644 tools/testing/selftests/bpf/progs/bpf_syscall_macro.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_type_tag_user.c + create mode 100644 tools/testing/selftests/bpf/progs/core_kern_overflow.c + rename tools/testing/selftests/bpf/progs/{btf_decl_tag.c => test_btf_decl_tag.c} (100%) +Merging ipsec-next/master (2ecda181682e xfrm: delete duplicated functions that calls same xfrm_api_check()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Merge made by the 'ort' strategy. + net/xfrm/xfrm_device.c | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) +Merging mlx5-next/mlx5-next (cac3231cc684 mlx5: remove usused static inlines) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Merge made by the 'ort' strategy. + drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h | 9 --------- + drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.h | 7 ------- + include/linux/mlx5/driver.h | 10 ---------- + 3 files changed, 26 deletions(-) +Merging netfilter-next/master (c828414ac935 netfilter: nft_compat: suppress comment match) +$ 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/nft_exthdr.c +Merge made by the 'ort' strategy. + include/linux/netfilter.h | 1 + + include/linux/netfilter/nf_conntrack_pptp.h | 38 ++++--- + include/net/netfilter/nf_conntrack_acct.h | 1 - + include/net/netfilter/nf_conntrack_ecache.h | 13 --- + include/net/netfilter/nf_conntrack_extend.h | 18 +--- + include/net/netfilter/nf_conntrack_labels.h | 3 - + include/net/netfilter/nf_conntrack_seqadj.h | 3 - + include/net/netfilter/nf_conntrack_timeout.h | 12 --- + include/net/netfilter/nf_conntrack_timestamp.h | 13 --- + include/uapi/linux/netfilter/nfnetlink_queue.h | 1 + + net/ipv4/netfilter/nf_nat_pptp.c | 24 ++--- + net/netfilter/nf_conntrack_acct.c | 19 ---- + net/netfilter/nf_conntrack_core.c | 94 +++--------------- + net/netfilter/nf_conntrack_ecache.c | 24 +---- + net/netfilter/nf_conntrack_extend.c | 132 ++++++++++++++----------- + net/netfilter/nf_conntrack_helper.c | 17 ---- + net/netfilter/nf_conntrack_labels.c | 20 +--- + net/netfilter/nf_conntrack_pptp.c | 60 ++++------- + net/netfilter/nf_conntrack_proto_udp.c | 4 +- + net/netfilter/nf_conntrack_seqadj.c | 16 --- + net/netfilter/nf_conntrack_timeout.c | 19 ---- + net/netfilter/nf_conntrack_timestamp.c | 20 ---- + net/netfilter/nf_nat_core.c | 28 +----- + net/netfilter/nf_synproxy_core.c | 24 +---- + net/netfilter/nfnetlink_queue.c | 5 + + net/netfilter/nft_compat.c | 9 ++ + net/netfilter/nft_exthdr.c | 96 +++++++++++++++++- + net/sched/act_ct.c | 13 --- + 28 files changed, 253 insertions(+), 474 deletions(-) +Merging ipvs-next/master (c828414ac935 netfilter: nft_compat: suppress comment match) +$ 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 bluetooth/master (4840aa67576b Bluetooth: hci_core: Fix leaking sent_cmd skb) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btusb.c | 1 + + include/net/bluetooth/mgmt.h | 2 +- + net/bluetooth/eir.h | 20 ++++++++++++++++++ + net/bluetooth/hci_core.c | 1 + + net/bluetooth/hci_sync.c | 2 +- + net/bluetooth/mgmt.c | 50 ++++++++++++++++---------------------------- + 6 files changed, 42 insertions(+), 34 deletions(-) +Merging wireless-next/main (c761161851d3 mac80211: Remove redundent assignment channel_type) +$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/main +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +Auto-merging net/mac80211/mlme.c +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath10k/core.c | 16 + + drivers/net/wireless/ath/ath10k/htt.c | 153 ++++++++ + drivers/net/wireless/ath/ath10k/htt.h | 296 +++++++++++++-- + drivers/net/wireless/ath/ath10k/htt_rx.c | 331 +++++++++++----- + drivers/net/wireless/ath/ath10k/htt_tx.c | 36 +- + drivers/net/wireless/ath/ath10k/hw.c | 15 +- + drivers/net/wireless/ath/ath10k/hw.h | 27 +- + drivers/net/wireless/ath/ath10k/rx_desc.h | 40 +- + drivers/net/wireless/ath/ath10k/snoc.c | 15 +- + drivers/net/wireless/ath/ath10k/txrx.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi.c | 2 +- + drivers/net/wireless/ath/ath10k/wow.c | 7 +- + drivers/net/wireless/ath/ath11k/core.c | 10 + + drivers/net/wireless/ath/ath11k/core.h | 1 + + drivers/net/wireless/ath/ath11k/debugfs.c | 6 + + drivers/net/wireless/ath/ath11k/dp_rx.c | 195 +++++----- + drivers/net/wireless/ath/ath11k/dp_tx.c | 5 +- + drivers/net/wireless/ath/ath11k/hal_rx.h | 8 +- + drivers/net/wireless/ath/ath11k/hw.c | 16 + + drivers/net/wireless/ath/ath11k/hw.h | 2 + + drivers/net/wireless/ath/ath11k/mac.c | 52 ++- + drivers/net/wireless/ath/ath11k/mhi.c | 1 + + drivers/net/wireless/ath/ath11k/peer.c | 40 +- + drivers/net/wireless/ath/ath11k/qmi.c | 3 +- + drivers/net/wireless/ath/ath11k/reg.c | 25 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 4 - + drivers/net/wireless/ath/ath5k/dma.c | 23 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 3 + + drivers/net/wireless/ath/ath9k/eeprom.c | 6 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 5 + + drivers/net/wireless/ath/dfs_pattern_detector.c | 6 +- + drivers/net/wireless/ath/wcn36xx/main.c | 104 +++++- + drivers/net/wireless/ath/wcn36xx/txrx.c | 36 ++ + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 13 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 33 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/fwil.c | 34 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwil.h | 28 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 78 ++-- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 - + .../broadcom/brcm80211/include/brcm_hw_ids.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 3 + + drivers/net/wireless/microchip/wilc1000/spi.c | 5 +- + drivers/net/wireless/ray_cs.c | 6 + + drivers/net/wireless/realtek/rtlwifi/cam.c | 2 +- + drivers/net/wireless/realtek/rtw88/fw.c | 40 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 5 +- + drivers/net/wireless/realtek/rtw88/main.c | 16 +- + drivers/net/wireless/realtek/rtw88/main.h | 4 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 + + drivers/net/wireless/realtek/rtw89/Kconfig | 4 + + drivers/net/wireless/realtek/rtw89/Makefile | 13 +- + drivers/net/wireless/realtek/rtw89/cam.c | 34 +- + drivers/net/wireless/realtek/rtw89/cam.h | 5 + + drivers/net/wireless/realtek/rtw89/coex.c | 11 +- + drivers/net/wireless/realtek/rtw89/core.c | 415 ++++++++++++++++----- + drivers/net/wireless/realtek/rtw89/core.h | 52 ++- + drivers/net/wireless/realtek/rtw89/debug.c | 22 +- + drivers/net/wireless/realtek/rtw89/fw.c | 131 +++++-- + drivers/net/wireless/realtek/rtw89/fw.h | 139 ++++++- + drivers/net/wireless/realtek/rtw89/mac.c | 82 +++- + drivers/net/wireless/realtek/rtw89/mac.h | 21 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 44 ++- + drivers/net/wireless/realtek/rtw89/pci.c | 161 +++----- + drivers/net/wireless/realtek/rtw89/pci.h | 5 + + drivers/net/wireless/realtek/rtw89/phy.c | 44 ++- + drivers/net/wireless/realtek/rtw89/phy.h | 6 + + drivers/net/wireless/realtek/rtw89/reg.h | 18 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 20 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.h | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 39 ++ + drivers/net/wireless/realtek/rtw89/txrx.h | 3 + + drivers/net/wireless/st/cw1200/wsm.c | 2 +- + include/linux/ieee80211.h | 8 +- + include/linux/ssb/ssb_driver_gige.h | 2 +- + include/net/cfg80211.h | 10 +- + include/net/ieee80211_radiotap.h | 4 +- + include/net/mac80211.h | 19 +- + net/mac80211/airtime.c | 11 +- + net/mac80211/debugfs.c | 2 + + net/mac80211/debugfs_key.c | 2 +- + net/mac80211/debugfs_netdev.c | 4 +- + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/mesh.c | 2 +- + net/mac80211/mlme.c | 183 ++++++++- + net/mac80211/rc80211_minstrel_ht.c | 2 +- + net/mac80211/rx.c | 2 + + net/mac80211/sta_info.c | 3 +- + net/mac80211/status.c | 14 +- + net/mac80211/util.c | 28 +- + net/mac80211/vht.c | 4 +- + net/wireless/pmsr.c | 4 - + net/wireless/scan.c | 9 +- + net/wireless/util.c | 8 +- + 95 files changed, 2479 insertions(+), 887 deletions(-) + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852ae.c +Merging mtd/mtd/next (ad5e35f58384 mtd: Replace the expert mode symbols with a single helper) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Auto-merging drivers/mtd/nand/raw/brcmnand/brcmnand.c +Merge made by the 'ort' strategy. + drivers/mtd/devices/mchp23k256.c | 16 +++++++++++++++- + drivers/mtd/devices/mchp48l640.c | 12 +++++++++++- + drivers/mtd/mtd_blkdevs.c | 1 + + drivers/mtd/mtdcore.c | 23 +++++++++++++++-------- + drivers/mtd/nand/core.c | 2 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 4 ++-- + drivers/mtd/nand/raw/atmel/pmecc.c | 4 ++-- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +- + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 2 +- + drivers/mtd/nand/raw/ingenic/jz4780_bch.c | 2 +- + drivers/mtd/nand/raw/mtk_ecc.c | 2 +- + drivers/mtd/nand/raw/nand_base.c | 2 +- + drivers/mtd/nand/raw/nand_bbt.c | 2 +- + drivers/mtd/nand/raw/omap2.c | 2 +- + drivers/mtd/nand/raw/renesas-nand-controller.c | 2 +- + drivers/mtd/nand/raw/sh_flctl.c | 2 +- + drivers/mtd/spi-nor/controllers/aspeed-smc.c | 15 +++++++++++++-- + include/linux/mtd/mtd.h | 8 ++++++-- + 18 files changed, 75 insertions(+), 28 deletions(-) +Merging nand/nand/next (8cba323437a4 mtd: rawnand: protect access to rawnand devices while in suspend) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging MAINTAINERS +Auto-merging drivers/mtd/nand/raw/Kconfig +Auto-merging drivers/mtd/nand/raw/brcmnand/brcmnand.c +Auto-merging drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +Auto-merging drivers/mtd/nand/raw/nand_base.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/bcma/driver_chipcommon_nflash.c | 20 +++- + drivers/mtd/nand/onenand/generic.c | 7 +- + drivers/mtd/nand/raw/Kconfig | 13 +++ + drivers/mtd/nand/raw/brcmnand/Makefile | 2 + + drivers/mtd/nand/raw/brcmnand/bcma_nand.c | 132 +++++++++++++++++++++++ + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 160 +++++++++++++++++++--------- + drivers/mtd/nand/raw/brcmnand/brcmnand.h | 29 +++++ + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 27 ++++- + drivers/mtd/nand/raw/nand_base.c | 81 +++++++------- + drivers/mtd/nand/raw/nandsim.c | 47 ++++---- + drivers/mtd/nand/raw/omap_elm.c | 4 +- + include/linux/bcma/bcma_driver_chipcommon.h | 5 + + include/linux/mtd/rawnand.h | 2 + + include/linux/platform_data/brcmnand.h | 12 +++ + 15 files changed, 409 insertions(+), 133 deletions(-) + create mode 100644 drivers/mtd/nand/raw/brcmnand/bcma_nand.c + create mode 100644 include/linux/platform_data/brcmnand.h +Merging spi-nor/spi-nor/next (e783362eb54c Linux 5.17-rc1) +$ 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 (95e26b0391d0 crypto: sl3516 - remove redundant initializations of pointers in_sg and out_sg) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging crypto/algapi.c +Auto-merging drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-hisi-hpre | 178 +++---- + Documentation/ABI/testing/debugfs-hisi-sec | 146 +++--- + Documentation/ABI/testing/debugfs-hisi-zip | 146 +++--- + arch/arm/crypto/aes-neonbs-core.S | 105 +++-- + arch/arm/crypto/aes-neonbs-glue.c | 35 +- + arch/arm64/crypto/Kconfig | 2 +- + arch/arm64/crypto/aes-glue.c | 22 +- + arch/arm64/crypto/aes-modes.S | 18 +- + arch/arm64/crypto/aes-neonbs-core.S | 264 +++-------- + arch/arm64/crypto/aes-neonbs-glue.c | 97 ++-- + arch/arm64/crypto/sm3-ce-glue.c | 28 +- + arch/arm64/lib/crc32.S | 87 +++- + arch/x86/crypto/Makefile | 3 + + arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 63 +-- + arch/x86/crypto/sm3-avx-asm_64.S | 517 +++++++++++++++++++++ + arch/x86/crypto/sm3_avx_glue.c | 134 ++++++ + crypto/Kconfig | 17 +- + crypto/algapi.c | 6 + + crypto/authenc.c | 2 +- + crypto/memneq.c | 22 +- + crypto/rsa-pkcs1pad.c | 38 +- + crypto/sm2.c | 38 +- + crypto/sm3_generic.c | 142 +----- + crypto/tcrypt.c | 222 +-------- + crypto/testmgr.c | 3 - + drivers/char/hw_random/Kconfig | 2 +- + drivers/char/hw_random/core.c | 24 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 2 + + drivers/crypto/atmel-aes.c | 1 + + drivers/crypto/atmel-sha.c | 1 + + drivers/crypto/ccp/ccp-crypto-aes.c | 5 +- + drivers/crypto/ccp/sev-dev.c | 2 +- + drivers/crypto/gemini/sl3516-ce-cipher.c | 4 +- + drivers/crypto/hisilicon/qm.c | 2 +- + drivers/crypto/hisilicon/sec2/sec_crypto.c | 27 +- + drivers/crypto/hisilicon/sec2/sec_crypto.h | 6 +- + drivers/crypto/marvell/Kconfig | 1 + + drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 1 - + drivers/crypto/marvell/octeontx2/otx2_cptlf.h | 19 +- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 56 ++- + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 17 +- + drivers/crypto/mxs-dcp.c | 2 +- + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 2 +- + drivers/crypto/qat/qat_common/adf_gen4_pfvf.c | 42 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 1 + + include/crypto/sm3.h | 34 +- + kernel/padata.c | 2 +- + lib/crc32.c | 14 +- + lib/crc32test.c | 2 +- + lib/crypto/Kconfig | 3 + + lib/crypto/Makefile | 3 + + lib/crypto/sm3.c | 246 ++++++++++ + 52 files changed, 1742 insertions(+), 1114 deletions(-) + create mode 100644 arch/x86/crypto/sm3-avx-asm_64.S + create mode 100644 arch/x86/crypto/sm3_avx_glue.c + create mode 100644 lib/crypto/sm3.c +Merging drm/drm-next (53dbee4926d3 Merge tag 'drm-misc-next-2022-01-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging Documentation/gpu/todo.rst +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/bridge/nwl-dsi.c +Auto-merging drivers/gpu/drm/dp/drm_dp.c +Auto-merging drivers/gpu/drm/drm_privacy_screen.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/tegra/dp.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.h +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging include/drm/dp/drm_dp_helper.h +Auto-merging include/linux/fb.h +Merge made by the 'ort' strategy. + .../bindings/display/bridge/lvds-codec.yaml | 1 + + .../bindings/display/bridge/ti,sn65dsi83.yaml | 5 +- + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/panel/sony,acx424akp.yaml | 11 +- + Documentation/gpu/drm-internals.rst | 6 + + Documentation/gpu/drm-kms-helpers.rst | 26 +- + Documentation/gpu/drm-kms.rst | 6 +- + Documentation/gpu/drm-mm.rst | 2 +- + Documentation/gpu/todo.rst | 15 + + Documentation/gpu/vkms.rst | 2 - + drivers/char/agp/ati-agp.c | 8 +- + drivers/char/agp/backend.c | 2 + + drivers/char/agp/frontend.c | 4 +- + drivers/char/agp/nvidia-agp.c | 3 +- + drivers/char/agp/sworks-agp.c | 5 +- + drivers/char/agp/via-agp.c | 3 - + drivers/dma-buf/dma-resv.c | 46 +- + drivers/dma-buf/st-dma-resv.c | 26 +- + drivers/dma-buf/udmabuf.c | 4 + + drivers/firmware/sysfb_simplefb.c | 2 +- + drivers/gpu/drm/Kconfig | 15 + + drivers/gpu/drm/Makefile | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 5 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c | 2 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 2 +- + drivers/gpu/drm/amd/display/dc/os_types.h | 2 +- + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 2 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 +- + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 12 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 3 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 3 +- + drivers/gpu/drm/arm/malidp_drv.c | 3 +- + drivers/gpu/drm/ast/ast_drv.c | 18 +- + drivers/gpu/drm/ast/ast_main.c | 2 + + drivers/gpu/drm/ast/ast_mode.c | 5 +- + drivers/gpu/drm/bridge/Kconfig | 5 + + drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 31 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 2 +- + drivers/gpu/drm/bridge/analogix/Kconfig | 2 + + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 2 +- + .../gpu/drm/bridge/analogix/analogix-i2c-dptx.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 440 ++++++- + drivers/gpu/drm/bridge/analogix/anx7625.h | 80 +- + drivers/gpu/drm/bridge/cadence/Kconfig | 1 + + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 20 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 39 +- + drivers/gpu/drm/bridge/ite-it66121.c | 3 - + drivers/gpu/drm/bridge/lontium-lt9611.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 4 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 8 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 33 +- + drivers/gpu/drm/bridge/sii902x.c | 129 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 25 +- + drivers/gpu/drm/bridge/tc358767.c | 2 +- + drivers/gpu/drm/bridge/tc358775.c | 4 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 53 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 4 +- + drivers/gpu/drm/dp/Makefile | 9 + + drivers/gpu/drm/{drm_dp_helper.c => dp/drm_dp.c} | 6 +- + drivers/gpu/drm/{ => dp}/drm_dp_aux_bus.c | 4 +- + drivers/gpu/drm/{ => dp}/drm_dp_aux_dev.c | 6 +- + drivers/gpu/drm/{ => dp}/drm_dp_cec.c | 2 +- + drivers/gpu/drm/{ => dp}/drm_dp_dual_mode_helper.c | 2 +- + drivers/gpu/drm/dp/drm_dp_helper_internal.h | 33 + + drivers/gpu/drm/dp/drm_dp_helper_mod.c | 22 + + drivers/gpu/drm/{ => dp}/drm_dp_mst_topology.c | 8 +- + .../drm/{ => dp}/drm_dp_mst_topology_internal.h | 2 +- + drivers/gpu/drm/drm_buddy.c | 535 ++++++++ + drivers/gpu/drm/drm_color_mgmt.c | 4 + + drivers/gpu/drm/drm_crtc_helper_internal.h | 27 - + drivers/gpu/drm/drm_dsc.c | 2 +- + drivers/gpu/drm/drm_edid.c | 104 +- + drivers/gpu/drm/drm_kms_helper_common.c | 14 - + drivers/gpu/drm/drm_plane.c | 9 +- + drivers/gpu/drm/drm_privacy_screen.c | 5 +- + drivers/gpu/drm/drm_privacy_screen_x86.c | 17 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 3 +- + drivers/gpu/drm/exynos/Kconfig | 1 + + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 14 +- + drivers/gpu/drm/gma500/gma_display.c | 6 +- + drivers/gpu/drm/gma500/intel_bios.c | 2 +- + drivers/gpu/drm/gma500/mmu.c | 8 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 3 +- + drivers/gpu/drm/i915/Kconfig | 2 + + drivers/gpu/drm/i915/Makefile | 1 - + drivers/gpu/drm/i915/display/intel_bios.c | 2 +- + drivers/gpu/drm/i915/display/intel_display.c | 2 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 4 +- + drivers/gpu/drm/i915/display/intel_dp.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 4 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 4 +- + drivers/gpu/drm/i915/i915_buddy.c | 466 ------- + drivers/gpu/drm/i915/i915_buddy.h | 143 -- + drivers/gpu/drm/i915/i915_module.c | 3 - + drivers/gpu/drm/i915/i915_scatterlist.c | 11 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 37 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.h | 4 +- + drivers/gpu/drm/i915/selftests/i915_buddy.c | 787 ----------- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 - + .../gpu/drm/i915/selftests/intel_memory_region.c | 13 +- + drivers/gpu/drm/imx/dcss/dcss-drv.c | 3 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 62 +- + drivers/gpu/drm/ingenic/ingenic-drm.h | 38 + + drivers/gpu/drm/meson/meson_drv.c | 25 +- + drivers/gpu/drm/meson/meson_osd_afbcd.c | 41 +- + drivers/gpu/drm/meson/meson_osd_afbcd.h | 1 + + drivers/gpu/drm/mgag200/mgag200_mode.c | 5 +- + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/dp/dp_audio.c | 2 +- + drivers/gpu/drm/msm/dp/dp_aux.h | 2 +- + drivers/gpu/drm/msm/dp/dp_catalog.c | 2 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 2 +- + drivers/gpu/drm/msm/edp/edp.h | 77 ++ + drivers/gpu/drm/msm/edp/edp_ctrl.c | 1373 ++++++++++++++++++++ + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 9 + + drivers/gpu/drm/nouveau/Kconfig | 1 + + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 17 +- + drivers/gpu/drm/nouveau/nouveau_encoder.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_mem.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 13 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 317 +++-- + drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h | 35 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c | 13 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sorga102.c | 4 + + .../gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 14 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c | 18 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c | 9 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 1 + + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 8 +- + drivers/gpu/drm/panel/panel-edp.c | 21 +- + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 4 +- + drivers/gpu/drm/panel/panel-simple.c | 33 + + drivers/gpu/drm/panfrost/panfrost_features.h | 212 +-- + drivers/gpu/drm/panfrost/panfrost_gpu.c | 32 +- + drivers/gpu/drm/radeon/atombios_dp.c | 2 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 4 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +- + drivers/gpu/drm/radeon/radeon_mode.h | 4 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- + drivers/gpu/drm/rockchip/Kconfig | 2 + + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 2 +- + drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 8 +- + drivers/gpu/drm/selftests/test-drm_plane_helper.c | 4 + + drivers/gpu/drm/stm/drv.c | 5 + + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 114 +- + drivers/gpu/drm/stm/ltdc.c | 810 +++++++++--- + drivers/gpu/drm/stm/ltdc.h | 12 +- + drivers/gpu/drm/tegra/Kconfig | 1 + + drivers/gpu/drm/tegra/dp.c | 2 +- + drivers/gpu/drm/tegra/dpaux.c | 2 +- + drivers/gpu/drm/tegra/sor.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +- + drivers/gpu/drm/tiny/bochs.c | 20 +- + drivers/gpu/drm/tiny/cirrus.c | 17 +- + drivers/gpu/drm/tiny/simpledrm.c | 22 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 7 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 4 +- + drivers/gpu/drm/ttm/ttm_resource.c | 35 + + drivers/gpu/drm/ttm/ttm_sys_manager.c | 3 +- + drivers/gpu/drm/v3d/v3d_drv.c | 8 +- + drivers/gpu/drm/vc4/vc4_bo.c | 2 - + drivers/gpu/drm/vc4/vc4_drv.c | 33 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 132 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 5 +- + drivers/gpu/drm/vc4/vc4_regs.h | 3 + + drivers/gpu/drm/virtio/virtgpu_gem.c | 3 + + drivers/gpu/drm/vkms/vkms_drv.h | 2 + + drivers/gpu/drm/vkms/vkms_output.c | 29 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c | 3 +- + drivers/gpu/drm/xlnx/Kconfig | 1 + + drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +- + drivers/platform/chrome/Kconfig | 11 + + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/chromeos_privacy_screen.c | 153 +++ + drivers/platform/x86/thinkpad_acpi.c | 2 +- + drivers/video/fbdev/asiliantfb.c | 2 +- + drivers/video/fbdev/core/fbmem.c | 29 +- + drivers/video/fbdev/s3c-fb.c | 2 +- + drivers/video/fbdev/simplefb.c | 65 +- + drivers/video/fbdev/vga16fb.c | 5 + + include/drm/bridge/dw_mipi_dsi.h | 4 +- + include/drm/{ => dp}/drm_dp_aux_bus.h | 0 + include/drm/{ => dp}/drm_dp_dual_mode_helper.h | 0 + include/drm/{ => dp}/drm_dp_helper.h | 7 +- + include/drm/{ => dp}/drm_dp_mst_helper.h | 2 +- + include/drm/drm_buddy.h | 150 +++ + include/drm/drm_connector.h | 18 +- + include/drm/drm_crtc.h | 10 + + include/drm/drm_dsc.h | 2 +- + include/drm/drm_edid.h | 4 +- + include/drm/drm_mipi_dbi.h | 2 +- + include/drm/drm_modeset_lock.h | 1 + + include/drm/drm_module.h | 125 ++ + include/drm/drm_plane.h | 2 +- + include/drm/drm_privacy_screen_driver.h | 13 +- + include/drm/ttm/ttm_resource.h | 23 +- + include/linux/dma-buf-map.h | 4 +- + include/linux/dma-resv.h | 4 +- + include/linux/fb.h | 1 + + include/linux/rwsem.h | 2 +- + include/soc/bcm2835/raspberrypi-firmware.h | 1 + + include/uapi/drm/panfrost_drm.h | 4 +- + 233 files changed, 5377 insertions(+), 2613 deletions(-) + create mode 100644 drivers/gpu/drm/dp/Makefile + rename drivers/gpu/drm/{drm_dp_helper.c => dp/drm_dp.c} (99%) + rename drivers/gpu/drm/{ => dp}/drm_dp_aux_bus.c (99%) + rename drivers/gpu/drm/{ => dp}/drm_dp_aux_dev.c (98%) + rename drivers/gpu/drm/{ => dp}/drm_dp_cec.c (99%) + rename drivers/gpu/drm/{ => dp}/drm_dp_dual_mode_helper.c (99%) + create mode 100644 drivers/gpu/drm/dp/drm_dp_helper_internal.h + create mode 100644 drivers/gpu/drm/dp/drm_dp_helper_mod.c + rename drivers/gpu/drm/{ => dp}/drm_dp_mst_topology.c (99%) + rename drivers/gpu/drm/{ => dp}/drm_dp_mst_topology_internal.h (94%) + create mode 100644 drivers/gpu/drm/drm_buddy.c + delete mode 100644 drivers/gpu/drm/i915/i915_buddy.c + delete mode 100644 drivers/gpu/drm/i915/i915_buddy.h + delete mode 100644 drivers/gpu/drm/i915/selftests/i915_buddy.c + create mode 100644 drivers/gpu/drm/msm/edp/edp.h + create mode 100644 drivers/gpu/drm/msm/edp/edp_ctrl.c + create mode 100644 drivers/platform/chrome/chromeos_privacy_screen.c + rename include/drm/{ => dp}/drm_dp_aux_bus.h (100%) + rename include/drm/{ => dp}/drm_dp_dual_mode_helper.h (100%) + rename include/drm/{ => dp}/drm_dp_helper.h (99%) + rename include/drm/{ => dp}/drm_dp_mst_helper.h (99%) + create mode 100644 include/drm/drm_buddy.h + create mode 100644 include/drm/drm_module.h +Merging drm-misc/for-linux-next (d3cbc6e323c9 drm: panel-orientation-quirks: Add quirk for the 1Netbook OneXPlayer) +$ 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 (e6cc5dc39ba4 drm/amdgpu/smu11.5: restore cclks in vangogh_set_performance_level) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/calcs/dce_calcs.c +Auto-merging drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h +Auto-merging drivers/gpu/drm/amd/display/dc/inc/resource.h +Auto-merging drivers/gpu/drm/amd/display/include/dpcd_defs.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e21399e548c5] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 7 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 3 - + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 24 - + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 25 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 96 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 24 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 24 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 10 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 74 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 38 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 129 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 78 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 109 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 114 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 112 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 123 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 421 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 61 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 407 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 60 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 145 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 4 +- + drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 191 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 228 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 25 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 +- + 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/hdp_v4_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 86 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 44 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 17 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 68 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 58 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c | 25 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 81 +- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h | 6 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 55 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 8 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 3 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 30 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.h | 2 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 128 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 25 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 173 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_7.h | 2 +- + drivers/gpu/drm/amd/amdkfd/Makefile | 2 - + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 1608 +++++++++---- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 845 ------- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h | 230 -- + drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c | 158 -- + drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h | 293 --- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 57 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 246 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 51 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 313 ++- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 12 - + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 63 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 41 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 123 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 150 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 172 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 147 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 167 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 92 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 372 ++- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 436 +++- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 39 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 42 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 108 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 219 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 25 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 10 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 248 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 6 +- + drivers/gpu/drm/amd/display/dc/Makefile | 6 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 - + .../gpu/drm/amd/display/dc/bios/command_table2.c | 4 - + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 68 - + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 5 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 6 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 27 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.h | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 847 +++---- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 1361 ++++++----- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 917 ------- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 82 +- + drivers/gpu/drm/amd/display/dc/dc.h | 38 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 59 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 60 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 21 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 6 - + drivers/gpu/drm/amd/display/dc/dc_types.h | 6 - + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 2 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 17 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 4 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 127 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 5 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 18 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 3 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 15 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 41 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 21 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 7 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 12 - + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 320 +-- + .../drm/amd/display/dc/dcn302/dcn302_resource.h | 3 + + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 106 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 6 + + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 11 + + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 9 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 61 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 2 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 6 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 12 +- + .../drm/amd/display/dc/{ => dml}/calcs/bw_fixed.c | 0 + .../amd/display/dc/{ => dml}/calcs/calcs_logger.h | 0 + .../amd/display/dc/{ => dml}/calcs/custom_float.c | 0 + .../drm/amd/display/dc/{ => dml}/calcs/dce_calcs.c | 48 +- + .../amd/display/dc/{ => dml}/calcs/dcn_calc_auto.c | 0 + .../amd/display/dc/{ => dml}/calcs/dcn_calc_auto.h | 0 + .../amd/display/dc/{ => dml}/calcs/dcn_calc_math.c | 0 + .../drm/amd/display/dc/{ => dml}/calcs/dcn_calcs.c | 0 + .../gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c | 357 +++ + .../gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.h | 32 + + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 29 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 24 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 3 + + .../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 2 +- + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 4 +- + .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c | 4 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 13 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 56 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 2 - + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 5 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 6 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 - + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/link_dpcd.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 86 +- + drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 34 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 16 +- + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 4 +- + drivers/gpu/drm/amd/display/dc/link/Makefile | 30 + + .../gpu/drm/amd/display/dc/link/link_hwss_dio.c | 137 ++ + .../gpu/drm/amd/display/dc/link/link_hwss_dio.h | 53 + + .../gpu/drm/amd/display/dc/link/link_hwss_dpia.c | 51 + + .../gpu/drm/amd/display/dc/link/link_hwss_dpia.h | 34 + + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 254 ++ + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.h | 35 + + .../drm/amd/display/dc/link/link_hwss_hpo_frl.c | 43 + + .../drm/amd/display/dc/link/link_hwss_hpo_frl.h | 34 + + drivers/gpu/drm/amd/display/dc/virtual/Makefile | 2 +- + .../amd/display/dc/virtual/virtual_link_encoder.c | 3 +- + .../drm/amd/display/dc/virtual/virtual_link_hwss.c | 43 + + .../drm/amd/display/dc/virtual/virtual_link_hwss.h | 34 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 13 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 2 +- + .../drm/amd/display/include/bios_parser_types.h | 2 - + .../drm/amd/display/include/ddc_service_types.h | 5 + + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 4 - + .../gpu/drm/amd/display/include/grph_object_defs.h | 2 - + .../gpu/drm/amd/display/include/grph_object_id.h | 2 - + .../drm/amd/display/include/link_service_types.h | 12 - + .../drm/amd/display/modules/inc/mod_info_packet.h | 3 +- + .../amd/display/modules/info_packet/info_packet.c | 25 +- + drivers/gpu/drm/amd/include/amd_shared.h | 3 +- + .../asic_reg/{dcn => dpcs}/dpcs_3_0_0_offset.h | 7 + + .../asic_reg/{dcn => dpcs}/dpcs_3_0_0_sh_mask.h | 7 + + .../asic_reg/{dcn => dpcs}/dpcs_3_0_3_offset.h | 0 + .../asic_reg/{dcn => dpcs}/dpcs_3_0_3_sh_mask.h | 0 + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 9 - + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 13 +- + drivers/gpu/drm/amd/pm/Makefile | 13 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2520 ++++++++++---------- + drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c | 95 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 577 ++--- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 361 ++- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h | 32 + + drivers/gpu/drm/amd/pm/legacy-dpm/Makefile | 32 + + .../drm/amd/pm/{powerplay => legacy-dpm}/cik_dpm.h | 0 + .../drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.c | 37 +- + .../drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.h | 0 + .../drm/amd/pm/{powerplay => legacy-dpm}/kv_smc.c | 0 + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 1081 +++++++++ + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h | 38 + + .../drm/amd/pm/{powerplay => legacy-dpm}/ppsmc.h | 0 + .../amd/pm/{powerplay => legacy-dpm}/r600_dpm.h | 0 + .../drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.c | 188 +- + .../drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.h | 15 +- + .../drm/amd/pm/{powerplay => legacy-dpm}/si_smc.c | 0 + .../pm/{powerplay => legacy-dpm}/sislands_smc.h | 0 + drivers/gpu/drm/amd/pm/powerplay/Makefile | 4 - + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 400 +--- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 4 - + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 10 +- + .../drm/amd/pm/{ => powerplay}/inc/amd_powerplay.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/fiji_ppsmc.h | 0 + .../amd/pm/{ => powerplay}/inc/hardwaremanager.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hwmgr.h | 4 - + .../pm/{ => powerplay}/inc/polaris10_pwrvirus.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/power_state.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/pp_debug.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/pp_endian.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/pp_thermal.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/ppinterrupt.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10.h | 0 + .../amd/pm/{ => powerplay}/inc/smu10_driver_if.h | 0 + .../amd/pm/{ => powerplay}/inc/smu11_driver_if.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71.h | 0 + .../amd/pm/{ => powerplay}/inc/smu71_discrete.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72.h | 0 + .../amd/pm/{ => powerplay}/inc/smu72_discrete.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73.h | 0 + .../amd/pm/{ => powerplay}/inc/smu73_discrete.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74.h | 0 + .../amd/pm/{ => powerplay}/inc/smu74_discrete.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75.h | 0 + .../amd/pm/{ => powerplay}/inc/smu75_discrete.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu7_common.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu7_discrete.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu7_fusion.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu7_ppsmc.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu8_fusion.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h | 0 + .../amd/pm/{ => powerplay}/inc/smu9_driver_if.h | 0 + .../amd/pm/{ => powerplay}/inc/smu_ucode_xfer_cz.h | 2 +- + .../amd/pm/{ => powerplay}/inc/smu_ucode_xfer_vi.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/smumgr.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/tonga_ppsmc.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/vega10_ppsmc.h | 0 + .../pm/{ => powerplay}/inc/vega12/smu9_driver_if.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/vega12_ppsmc.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/vega20_ppsmc.h | 0 + .../gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 4 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c | 4 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu7_smumgr.c | 11 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu9_smumgr.c | 2 +- + .../drm/amd/pm/powerplay/smumgr/vega20_smumgr.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 658 ++--- + .../gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 48 +- + .../{inc => swsmu/inc/pmfw_if}/aldebaran_ppsmc.h | 0 + .../pm/{inc => swsmu/inc/pmfw_if}/arcturus_ppsmc.h | 0 + .../inc/pmfw_if}/smu11_driver_if_arcturus.h | 0 + .../inc/pmfw_if}/smu11_driver_if_cyan_skillfish.h | 0 + .../inc/pmfw_if}/smu11_driver_if_navi10.h | 0 + .../inc/pmfw_if}/smu11_driver_if_sienna_cichlid.h | 24 +- + .../inc/pmfw_if}/smu11_driver_if_vangogh.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu12_driver_if.h | 0 + .../inc/pmfw_if}/smu13_driver_if_aldebaran.h | 0 + .../inc/pmfw_if}/smu13_driver_if_yellow_carp.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v11_0_7_ppsmc.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v11_0_ppsmc.h | 0 + .../pm/{inc => swsmu/inc/pmfw_if}/smu_v11_5_pmfw.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v11_5_ppsmc.h | 2 +- + .../pm/{inc => swsmu/inc/pmfw_if}/smu_v11_8_pmfw.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v11_8_ppsmc.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v12_0_ppsmc.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_pmfw.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_ppsmc.h | 0 + .../amd/pm/{ => swsmu}/inc/smu_11_0_cdr_table.h | 0 + drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h | 0 + .../amd/pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0 + .../drm/amd/pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0 + drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0 + drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 0 + .../drm/amd/pm/{ => swsmu}/inc/smu_v13_0_pptable.h | 0 + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 102 +- + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 69 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 207 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 227 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 68 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 83 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 16 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 90 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 75 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 38 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 204 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 16 +- + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 8 +- + drivers/gpu/drm/radeon/cik.c | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 2 +- + drivers/gpu/drm/radeon/ni.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 + + drivers/gpu/drm/radeon/radeon_device.c | 19 +- + drivers/gpu/drm/radeon/radeon_object.c | 1 - + drivers/gpu/drm/radeon/radeon_uvd.c | 5 +- + drivers/gpu/drm/radeon/rv770.c | 2 +- + drivers/gpu/drm/radeon/si.c | 2 +- + include/uapi/drm/amdgpu_drm.h | 19 +- + include/uapi/linux/kfd_ioctl.h | 92 +- + 388 files changed, 13336 insertions(+), 10810 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/calcs/Makefile + delete mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/bw_fixed.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/calcs_logger.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/custom_float.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dce_calcs.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dcn_calc_auto.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dcn_calc_auto.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dcn_calc_math.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dcn_calcs.c (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_dio.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_dio.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_dpia.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_dpia.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_hpo_frl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_hpo_frl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/virtual/virtual_link_hwss.c + create mode 100644 drivers/gpu/drm/amd/display/dc/virtual/virtual_link_hwss.h + rename drivers/gpu/drm/amd/include/asic_reg/{dcn => dpcs}/dpcs_3_0_0_offset.h (99%) + rename drivers/gpu/drm/amd/include/asic_reg/{dcn => dpcs}/dpcs_3_0_0_sh_mask.h (99%) + rename drivers/gpu/drm/amd/include/asic_reg/{dcn => dpcs}/dpcs_3_0_3_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{dcn => dpcs}/dpcs_3_0_3_sh_mask.h (100%) + create mode 100644 drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c + create mode 100644 drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h + create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/Makefile + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/cik_dpm.h (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.c (99%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.h (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_smc.c (100%) + create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c + create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/r600_dpm.h (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.c (98%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.h (99%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_smc.c (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/sislands_smc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/amd_powerplay.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/fiji_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hardwaremanager.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hwmgr.h (99%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/polaris10_pwrvirus.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/power_state.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_debug.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_endian.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_thermal.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/ppinterrupt.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu11_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_common.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_fusion.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8_fusion.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_cz.h (99%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_vi.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smumgr.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/tonga_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega10_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12/smu9_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega20_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h (97%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/aldebaran_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/arcturus_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_arcturus.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_cyan_skillfish.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_navi10.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_sienna_cichlid.h (99%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_vangogh.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu12_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu13_driver_if_aldebaran.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu13_driver_if_yellow_carp.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_0_7_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_0_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_5_pmfw.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_5_ppsmc.h (99%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_8_pmfw.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_8_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v12_0_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_pmfw.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_11_0_cdr_table.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h (99%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_pptable.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0_pptable.h (100%) +Merging drm-intel/for-linux-next (98476876b837 drm/i915: Fix IPS disable in intel_plane_disable_noatomic()) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging Documentation/gpu/todo.rst +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/ast/ast_mode.c +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/i915/display/intel_bios.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_drrs.c +Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/display/intel_lspcon.c +Auto-merging drivers/gpu/drm/i915/display/intel_overlay.c +Auto-merging drivers/gpu/drm/i915/display/intel_tc.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/i915_mm.h +Auto-merging drivers/gpu/drm/i915/i915_reg.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/intel_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_pm.h +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/mgag200/mgag200_mode.c +Auto-merging drivers/gpu/drm/tiny/cirrus.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c +Auto-merging drivers/gpu/drm/ttm/ttm_resource.c +Auto-merging drivers/gpu/drm/vkms/vkms_drv.h +Auto-merging drivers/misc/fastrpc.c +Auto-merging include/drm/drm_crtc.h +Auto-merging include/drm/ttm/ttm_resource.h +CONFLICT (modify/delete): include/linux/dma-buf-map.h deleted in drm-intel/for-linux-next and modified in HEAD. Version HEAD of include/linux/dma-buf-map.h left in tree. +Resolved 'drivers/gpu/drm/i915/i915_reg.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f include/linux/dma-buf-map.h +rm 'include/linux/dma-buf-map.h' +$ git commit --no-edit -v -a +[master 257a04c376bf] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + Documentation/driver-api/device-io.rst | 9 + + Documentation/driver-api/dma-buf.rst | 9 - + Documentation/gpu/todo.rst | 20 +- + MAINTAINERS | 9 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/dma-buf/dma-buf.c | 22 +- + drivers/dma-buf/heaps/cma_heap.c | 10 +- + drivers/dma-buf/heaps/system_heap.c | 10 +- + drivers/gpu/drm/ast/ast_drv.h | 2 +- + drivers/gpu/drm/ast/ast_mode.c | 8 +- + drivers/gpu/drm/drm_cache.c | 18 +- + drivers/gpu/drm/drm_client.c | 9 +- + drivers/gpu/drm/drm_fb_helper.c | 12 +- + drivers/gpu/drm/drm_gem.c | 12 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 9 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 16 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 15 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 4 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 25 +- + drivers/gpu/drm/drm_internal.h | 6 +- + drivers/gpu/drm/drm_mipi_dbi.c | 8 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 + + drivers/gpu/drm/drm_prime.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 8 +- + drivers/gpu/drm/gud/gud_pipe.c | 4 +- + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 5 +- + drivers/gpu/drm/i915/Makefile | 4 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 18 +- + drivers/gpu/drm/i915/display/g4x_hdmi.h | 2 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 271 ++ + drivers/gpu/drm/i915/display/hsw_ips.h | 26 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 105 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 7 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 2 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 8 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 1 + + drivers/gpu/drm/i915/display/intel_backlight.c | 3 + + drivers/gpu/drm/i915/display/intel_bios.c | 215 +- + drivers/gpu/drm/i915/display/intel_bw.c | 14 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 66 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 9 +- + drivers/gpu/drm/i915/display/intel_color.c | 19 + + drivers/gpu/drm/i915/display/intel_combo_phy.c | 1 + + .../gpu/drm/i915/display/intel_combo_phy_regs.h | 162 + + drivers/gpu/drm/i915/display/intel_crt.h | 2 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 1 + + drivers/gpu/drm/i915/display/intel_cursor.c | 25 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 143 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 2 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 42 +- + drivers/gpu/drm/i915/display/intel_de.h | 1 - + drivers/gpu/drm/i915/display/intel_display.c | 802 ++-- + drivers/gpu/drm/i915/display/intel_display.h | 39 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 7 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 45 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 2 +- + drivers/gpu/drm/i915/display/intel_display_trace.h | 1 + + drivers/gpu/drm/i915/display/intel_display_types.h | 22 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 14 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 165 +- + drivers/gpu/drm/i915/display/intel_dp.h | 2 - + drivers/gpu/drm/i915/display/intel_dp_aux.c | 8 +- + drivers/gpu/drm/i915/display/intel_dp_aux.h | 4 - + drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 - + drivers/gpu/drm/i915/display/intel_dpll.c | 12 + + drivers/gpu/drm/i915/display/intel_dpll.h | 1 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 36 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 46 +- + drivers/gpu/drm/i915/display/intel_drrs.c | 107 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 2 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 29 +- + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 238 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 7 + + drivers/gpu/drm/i915/display/intel_fdi.c | 5 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 7 - + drivers/gpu/drm/i915/display/intel_gmbus.h | 1 - + drivers/gpu/drm/i915/display/intel_hdcp.c | 3 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 100 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 6 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 21 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 144 +- + drivers/gpu/drm/i915/display/intel_lvds.h | 2 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 56 +- + drivers/gpu/drm/i915/display/intel_opregion.h | 10 + + drivers/gpu/drm/i915/display/intel_overlay.c | 1 + + drivers/gpu/drm/i915/display/intel_pch_display.c | 88 +- + drivers/gpu/drm/i915/display/intel_pch_display.h | 8 + + drivers/gpu/drm/i915/display/intel_pps.c | 22 +- + drivers/gpu/drm/i915/display/intel_sdvo.h | 2 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 30 +- + drivers/gpu/drm/i915/display/intel_snps_phy_regs.h | 75 + + drivers/gpu/drm/i915/display/intel_sprite.c | 65 +- + drivers/gpu/drm/i915/display/intel_tc.c | 2 + + drivers/gpu/drm/i915/display/intel_tc_phy_regs.h | 280 ++ + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 26 - + drivers/gpu/drm/i915/display/intel_vdsc.c | 7 +- + drivers/gpu/drm/i915/display/intel_vga.c | 9 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 195 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 + + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 2 + + drivers/gpu/drm/i915/gem/i915_gem_tiling.h | 18 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.h | 14 + + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 3 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 3 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 6 +- + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 6 +- + drivers/gpu/drm/i915/gt/gen2_engine_cs.c | 2 + + drivers/gpu/drm/i915/gt/gen6_engine_cs.c | 1 + + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 2 + + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 1 + + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 3 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 1 - + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_regs.h | 223 ++ + .../gpu/drm/i915/gt/intel_execlists_submission.c | 2 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 1 + + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 + + drivers/gpu/drm/i915/gt/intel_gt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 2 + + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 10 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1554 ++++++++ + drivers/gpu/drm/i915/gt/intel_gtt.c | 1 + + drivers/gpu/drm/i915/gt/intel_llc.c | 10 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 2 + + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 15 - + drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 16 +- + drivers/gpu/drm/i915/gt/intel_rc6.h | 2 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 1 + + drivers/gpu/drm/i915/gt/intel_reset.c | 4 + + drivers/gpu/drm/i915/gt/intel_ring.c | 1 + + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 12 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 10 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 3 +- + drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 1 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 8 +- + drivers/gpu/drm/i915/gt/intel_workarounds_types.h | 2 +- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 1 + + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 1 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 1 + + drivers/gpu/drm/i915/gt/selftest_llc.c | 5 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 6 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 1 + + .../gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 1 - + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.h | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + + drivers/gpu/drm/i915/gvt/aperture_gm.c | 1 + + drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 +- + drivers/gpu/drm/i915/gvt/display.c | 17 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 19 +- + drivers/gpu/drm/i915/gvt/edid.c | 1 + + drivers/gpu/drm/i915/gvt/fb_decoder.c | 49 +- + drivers/gpu/drm/i915/gvt/gtt.c | 70 +- + drivers/gpu/drm/i915/gvt/gtt.h | 4 +- + drivers/gpu/drm/i915/gvt/gvt.h | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 36 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 11 +- + drivers/gpu/drm/i915/gvt/interrupt.h | 4 +- + drivers/gpu/drm/i915/gvt/mmio.c | 3 + + drivers/gpu/drm/i915/gvt/mmio_context.c | 6 +- + drivers/gpu/drm/i915/gvt/mmio_context.h | 2 +- + drivers/gpu/drm/i915/gvt/reg.h | 1 - + drivers/gpu/drm/i915/gvt/sched_policy.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 2 + + drivers/gpu/drm/i915/gvt/scheduler.h | 2 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 4 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 76 +- + drivers/gpu/drm/i915/i915_cmd_parser.h | 26 + + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 3 + + drivers/gpu/drm/i915/i915_drv.h | 174 +- + drivers/gpu/drm/i915/i915_gem.c | 1 + + drivers/gpu/drm/i915/i915_gem_evict.c | 1 + + drivers/gpu/drm/i915/i915_gem_evict.h | 24 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 1 + + drivers/gpu/drm/i915/i915_getparam.c | 2 + + drivers/gpu/drm/i915/i915_getparam.h | 15 + + drivers/gpu/drm/i915/i915_gpu_error.c | 2 + + drivers/gpu/drm/i915/i915_ioc32.c | 1 + + drivers/gpu/drm/i915/i915_ioctl.c | 94 + + drivers/gpu/drm/i915/i915_ioctl.h | 14 + + drivers/gpu/drm/i915/i915_irq.c | 18 +- + drivers/gpu/drm/i915/i915_irq.h | 1 + + drivers/gpu/drm/i915/i915_mm.h | 3 +- + drivers/gpu/drm/i915/i915_pci.c | 24 +- + drivers/gpu/drm/i915/i915_perf.c | 137 +- + drivers/gpu/drm/i915/i915_perf_oa_regs.h | 137 + + drivers/gpu/drm/i915/i915_perf_types.h | 2 +- + drivers/gpu/drm/i915/i915_pmu.c | 2 + + drivers/gpu/drm/i915/i915_reg.h | 4103 +++----------------- + drivers/gpu/drm/i915/i915_reg_defs.h | 101 + + drivers/gpu/drm/i915/i915_request.c | 1 + + drivers/gpu/drm/i915/i915_suspend.c | 1 + + drivers/gpu/drm/i915/i915_sysfs.c | 1 + + drivers/gpu/drm/i915/i915_utils.h | 15 - + drivers/gpu/drm/i915/i915_vma.c | 3 +- + drivers/gpu/drm/i915/intel_device_info.c | 13 +- + drivers/gpu/drm/i915/intel_device_info.h | 5 +- + drivers/gpu/drm/i915/intel_dram.c | 7 +- + drivers/gpu/drm/i915/intel_pci_config.h | 85 + + drivers/gpu/drm/i915/intel_pcode.c | 32 +- + drivers/gpu/drm/i915/intel_pcode.h | 12 +- + drivers/gpu/drm/i915/intel_pm.c | 262 +- + drivers/gpu/drm/i915/intel_pm.h | 1 - + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 - + drivers/gpu/drm/i915/intel_sbi.c | 1 + + drivers/gpu/drm/i915/intel_uncore.c | 73 +- + drivers/gpu/drm/i915/intel_uncore.h | 2 +- + drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 1 + + drivers/gpu/drm/i915/vlv_sideband.c | 1 + + drivers/gpu/drm/i915/vlv_sideband.h | 2 + + drivers/gpu/drm/i915/vlv_sideband_reg.h | 180 + + drivers/gpu/drm/i915/vlv_suspend.c | 2 + + drivers/gpu/drm/lima/lima_gem.c | 3 +- + drivers/gpu/drm/lima/lima_sched.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 7 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.h | 5 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 4 +- + drivers/gpu/drm/msm/msm_drv.h | 4 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 6 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 13 +- + drivers/gpu/drm/qxl/qxl_display.c | 8 +- + drivers/gpu/drm/qxl/qxl_draw.c | 6 +- + drivers/gpu/drm/qxl/qxl_drv.h | 10 +- + drivers/gpu/drm/qxl/qxl_object.c | 8 +- + drivers/gpu/drm/qxl/qxl_object.h | 4 +- + drivers/gpu/drm/qxl/qxl_prime.c | 4 +- + drivers/gpu/drm/radeon/radeon_gem.c | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 5 +- + drivers/gpu/drm/tegra/gem.c | 10 +- + drivers/gpu/drm/tiny/cirrus.c | 8 +- + drivers/gpu/drm/tiny/gm12u320.c | 7 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 16 +- + drivers/gpu/drm/ttm/ttm_resource.c | 42 +- + drivers/gpu/drm/ttm/ttm_tt.c | 8 +- + drivers/gpu/drm/udl/udl_modeset.c | 3 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 4 +- + drivers/gpu/drm/vkms/vkms_composer.c | 4 +- + drivers/gpu/drm/vkms/vkms_drv.h | 6 +- + drivers/gpu/drm/vkms/vkms_plane.c | 2 +- + drivers/gpu/drm/vkms/vkms_writeback.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 7 +- + drivers/gpu/drm/xen/xen_drm_front_gem.h | 6 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 8 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 9 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 11 +- + drivers/misc/fastrpc.c | 4 +- + include/drm/drm_cache.h | 6 +- + include/drm/drm_client.h | 7 +- + include/drm/drm_crtc.h | 2 - + include/drm/drm_gem.h | 6 +- + include/drm/drm_gem_atomic_helper.h | 6 +- + include/drm/drm_gem_cma_helper.h | 6 +- + include/drm/drm_gem_framebuffer_helper.h | 8 +- + include/drm/drm_gem_shmem_helper.h | 12 +- + include/drm/drm_gem_ttm_helper.h | 6 +- + include/drm/drm_gem_vram_helper.h | 9 +- + include/drm/drm_prime.h | 6 +- + include/drm/i915_pciids.h | 6 + + include/drm/ttm/ttm_bo_api.h | 10 +- + include/drm/ttm/ttm_kmap_iter.h | 10 +- + include/drm/ttm/ttm_resource.h | 6 +- + include/linux/dma-buf-map.h | 266 -- + include/linux/dma-buf.h | 12 +- + include/linux/iosys-map.h | 257 ++ + 281 files changed, 6590 insertions(+), 6389 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/hsw_ips.c + create mode 100644 drivers/gpu/drm/i915/display/hsw_ips.h + create mode 100644 drivers/gpu/drm/i915/display/intel_combo_phy_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_snps_phy_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_tc_phy_regs.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_tiling.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_userptr.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_regs.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_regs.h + create mode 100644 drivers/gpu/drm/i915/i915_cmd_parser.h + create mode 100644 drivers/gpu/drm/i915/i915_gem_evict.h + create mode 100644 drivers/gpu/drm/i915/i915_getparam.h + create mode 100644 drivers/gpu/drm/i915/i915_ioctl.c + create mode 100644 drivers/gpu/drm/i915/i915_ioctl.h + create mode 100644 drivers/gpu/drm/i915/i915_perf_oa_regs.h + create mode 100644 drivers/gpu/drm/i915/i915_reg_defs.h + create mode 100644 drivers/gpu/drm/i915/intel_pci_config.h + create mode 100644 drivers/gpu/drm/i915/vlv_sideband_reg.h + delete mode 100644 include/linux/dma-buf-map.h + create mode 100644 include/linux/iosys-map.h +Merging drm-intel-gt/for-linux-next-gt (bf8900406e9e drm/i915/guc: Use a single pass to calculate regset) +$ git merge -m Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel drm-intel-gt/for-linux-next-gt +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_stolen.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_tiling.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c +Auto-merging drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c +Auto-merging drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/gt/gen6_ppgtt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gtt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_region_lmem.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gt/selftest_hangcheck.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc.h +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +Auto-merging drivers/gpu/drm/i915/gvt/aperture_gm.c +Auto-merging drivers/gpu/drm/i915/gvt/dmabuf.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_gem_evict.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_getparam.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/intel_device_info.h +Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_reg.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 57ba385181a1] Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/i915.rst | 1 + + drivers/gpu/drm/i915/Makefile | 2 +- + drivers/gpu/drm/i915/display/intel_dpt.c | 33 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 8 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- + drivers/gpu/drm/i915/display/intel_plane_initial.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 11 +- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 239 ++++++------ + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 36 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 18 + + drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 51 ++- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 10 - + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 30 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 13 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 39 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 4 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 2 +- + .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 192 +++++++++- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 25 +- + .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 2 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 19 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 37 +- + drivers/gpu/drm/i915/gt/intel_context.c | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 9 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 38 ++ + drivers/gpu/drm/i915/gt/intel_ggtt.c | 133 ++++--- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 7 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 7 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 2 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 4 + + drivers/gpu/drm/i915/gt/intel_gtt.h | 19 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 4 + + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 22 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 39 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- + drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 80 ++-- + drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h | 23 ++ + drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 82 ++++ + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 126 ++++++- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 20 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 204 +++++++--- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 143 +++---- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 38 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 37 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 31 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 7 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 148 +++++--- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 31 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 43 ++- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 2 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 2 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 7 +- + drivers/gpu/drm/i915/i915_driver.c | 10 +- + drivers/gpu/drm/i915/i915_drv.h | 27 +- + drivers/gpu/drm/i915/i915_gem.c | 37 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 101 ++++- + drivers/gpu/drm/i915/i915_gem_gtt.c | 16 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 4 + + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 87 ++--- + drivers/gpu/drm/i915/i915_module.c | 3 + + drivers/gpu/drm/i915/i915_pci.c | 1 + + drivers/gpu/drm/i915/i915_perf.c | 8 +- + drivers/gpu/drm/i915/i915_request.c | 12 +- + drivers/gpu/drm/i915/i915_request.h | 6 +- + drivers/gpu/drm/i915/i915_vgpu.c | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 376 +++++++++++++----- + drivers/gpu/drm/i915/i915_vma.h | 34 +- + drivers/gpu/drm/i915/i915_vma_resource.c | 418 +++++++++++++++++++++ + drivers/gpu/drm/i915/i915_vma_resource.h | 234 ++++++++++++ + 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 | 19 +- + drivers/gpu/drm/i915/intel_device_info.h | 4 +- + drivers/gpu/drm/i915/intel_step.c | 15 + + drivers/gpu/drm/i915/intel_wopcm.c | 42 ++- + drivers/gpu/drm/i915/selftests/i915_gem.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 28 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 209 +++++++---- + drivers/gpu/drm/i915/selftests/i915_request.c | 119 +++++- + drivers/gpu/drm/i915/selftests/i915_vma.c | 30 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 11 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 21 +- + drivers/gpu/drm/i915/selftests/mock_gtt.h | 3 +- + 98 files changed, 2971 insertions(+), 1326 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h + create mode 100644 drivers/gpu/drm/i915/i915_vma_resource.c + create mode 100644 drivers/gpu/drm/i915/i915_vma_resource.h + delete mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.c + delete mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.h +$ git am -3 ../patches/0001-merge-fix-for-drm-i915-split-out-i915_gem_evict.h-fr.patch +Applying: merge fix for "drm/i915: split out i915_gem_evict.h from i915_drv.h" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/i915_gem_evict.h +$ git add -A . +$ git commit -v -a --amend +[master e6ec66474774] Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel + Date: Thu Feb 10 12:19:45 2022 +1100 +$ git am -3 ../patches/0001-extra-merge-fix-for-drm-i915-split-out-i915_gem_evic.patch +Applying: extra merge fix for "drm/i915: split out i915_gem_evict.h from i915_drv.h" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/i915_gem_evict.h +$ git add -A . +$ git commit -v -a --amend +[master bc0754f6745a] Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel + Date: Thu Feb 10 12:19:45 2022 +1100 +$ git am -3 ../patches/0001-extra-2-merge-fix-for-drm-i915-split-out-i915_gem_ev.patch +Applying: extra 2 merge fix for "drm/i915: split out i915_gem_evict.h from i915_drv.h" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/gem/i915_gem_mman.c +$ git add -A . +$ git commit -v -a --amend +[master 6f2dda35c136] Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel + Date: Thu Feb 10 12:19:45 2022 +1100 +$ git am -3 ../patches/0001-fix-up-for-drm-i915-Move-GT-registers-to-their-own-h.patch +Applying: fix up for "drm/i915: Move GT registers to their own header file" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/gt/intel_gt_regs.h +$ git add -A . +$ git commit -v -a --amend +[master 6f59c547db94] Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel + Date: Thu Feb 10 12:19:45 2022 +1100 +Merging drm-tegra/drm/tegra/for-next (22d7ee32f1fb gpu: host1x: Fix hang on Tegra186+) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Merge made by the 'ort' strategy. + drivers/gpu/host1x/syncpt.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) +Merging drm-msm/msm-next (6aa89ae1fb04 drm/msm/gpu: Cancel idle/boost work on suspend) +$ 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 'ort' 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 fbdev/for-next (c5510f53140c video: fbdev: Fix wrong file path for pvr2fb.c in Kconfig help text) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/video/fbdev/s3c-fb.c +Merge made by the 'ort' strategy. + .../bindings/display/simple-framebuffer.yaml | 12 +++-- + arch/parisc/include/asm/agp.h | 4 +- + arch/powerpc/include/asm/agp.h | 4 +- + arch/sparc/include/asm/agp.h | 6 +-- + drivers/video/backlight/lm3630a_bl.c | 1 - + drivers/video/backlight/qcom-wled.c | 1 + + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/atmel_lcdfb.c | 11 +++-- + drivers/video/fbdev/aty/aty128fb.c | 10 ++-- + drivers/video/fbdev/aty/mach64_ct.c | 4 +- + drivers/video/fbdev/aty/mach64_gx.c | 2 - + drivers/video/fbdev/au1200fb.c | 4 +- + drivers/video/fbdev/cirrusfb.c | 16 +++---- + drivers/video/fbdev/controlfb.c | 2 + + drivers/video/fbdev/core/fbcvt.c | 53 +++++++++------------- + drivers/video/fbdev/core/fbmem.c | 8 +--- + drivers/video/fbdev/da8xx-fb.c | 7 ++- + drivers/video/fbdev/imxfb.c | 2 + + drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- + drivers/video/fbdev/mb862xx/mb862xxfb_accel.c | 2 +- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 3 +- + drivers/video/fbdev/nvidia/nv_i2c.c | 2 +- + drivers/video/fbdev/ocfb.c | 2 +- + drivers/video/fbdev/omap/lcd_ams_delta.c | 16 +++---- + .../omapfb/displays/panel-lgphilips-lb035q02.c | 7 ++- + .../omapfb/displays/panel-sharp-ls037v7dw01.c | 7 ++- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +- + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 3 +- + .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 3 +- + .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 3 +- + .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 3 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 1 - + drivers/video/fbdev/pxa168fb.c | 15 +++--- + drivers/video/fbdev/pxa3xx-gcu.c | 10 ++-- + drivers/video/fbdev/s3c-fb.c | 12 ++--- + drivers/video/fbdev/savage/savagefb.h | 1 - + drivers/video/fbdev/savage/savagefb_driver.c | 7 +-- + drivers/video/fbdev/sis/sis_main.c | 2 +- + drivers/video/fbdev/smscufx.c | 3 +- + drivers/video/fbdev/ssd1307fb.c | 7 ++- + drivers/video/fbdev/via/lcd.c | 2 +- + drivers/video/fbdev/w100fb.c | 15 ++++-- + 42 files changed, 131 insertions(+), 148 deletions(-) +Merging regmap/for-next (1056c41634d4 regmap-irq: Fix typo in comment) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap-irq.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sound/for-next (69458e2c2780 ALSA: hda: Fix driver index handling at re-binding) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Merge made by the 'ort' strategy. + sound/pci/hda/hda_intel.c | 10 +- + sound/usb/mixer_s1810c.c | 2 +- + sound/usb/mixer_scarlett_gen2.c | 6 +- + tools/testing/selftests/alsa/mixer-test.c | 412 ++++++++++++++++++++++++++++-- + 4 files changed, 402 insertions(+), 28 deletions(-) +Merging sound-asoc/for-next (8be90641a0bb ASoC: dt-bindings: davinci-mcasp: convert McASP bindings to yaml schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/rockchip/cdn-dp-core.c +Auto-merging drivers/gpu/drm/rockchip/cdn-dp-core.h +Auto-merging sound/soc/amd/acp/acp-mach-common.c +Auto-merging sound/soc/amd/acp/acp-sof-mach.c +Auto-merging sound/soc/codecs/lpass-rx-macro.c +Merge made by the 'ort' strategy. + .../bindings/bus/nvidia,tegra210-aconnect.yaml | 1 + + .../bindings/dma/nvidia,tegra210-adma.yaml | 4 +- + .../bindings/interrupt-controller/arm,gic.yaml | 1 + + .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 5 + + .../bindings/sound/davinci-mcasp-audio.txt | 86 ---- + .../bindings/sound/davinci-mcasp-audio.yaml | 201 ++++++++ + .../devicetree/bindings/sound/fsl-asoc-card.txt | 1 + + .../bindings/sound/nvidia,tegra186-dspk.yaml | 4 +- + .../bindings/sound/nvidia,tegra210-admaif.yaml | 4 +- + .../bindings/sound/nvidia,tegra210-adx.yaml | 1 + + .../bindings/sound/nvidia,tegra210-ahub.yaml | 1 + + .../bindings/sound/nvidia,tegra210-amx.yaml | 3 + + .../bindings/sound/nvidia,tegra210-dmic.yaml | 1 + + .../bindings/sound/nvidia,tegra210-i2s.yaml | 1 + + .../bindings/sound/nvidia,tegra210-mixer.yaml | 1 + + .../bindings/sound/nvidia,tegra210-mvc.yaml | 1 + + .../bindings/sound/nvidia,tegra210-sfc.yaml | 1 + + .../devicetree/bindings/sound/realtek,rt5682s.yaml | 8 +- + .../devicetree/bindings/sound/simple-card.yaml | 11 + + .../devicetree/bindings/sound/tas5805m.yaml | 56 ++ + .../devicetree/bindings/sound/tlv320aic31xx.txt | 2 +- + MAINTAINERS | 1 + + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 28 + + drivers/gpu/drm/rockchip/cdn-dp-core.h | 4 + + include/dt-bindings/sound/tlv320aic31xx-micbias.h | 9 - + include/dt-bindings/sound/tlv320aic31xx.h | 14 + + include/sound/simple_card_utils.h | 1 + + include/sound/sof/info.h | 1 + + include/uapi/sound/sof/abi.h | 2 +- + sound/soc/amd/Kconfig | 1 + + sound/soc/amd/acp-config.c | 9 + + sound/soc/amd/acp/Kconfig | 10 + + sound/soc/amd/acp/Makefile | 4 + + sound/soc/amd/acp/acp-legacy-mach.c | 4 +- + sound/soc/amd/acp/acp-mach-common.c | 21 + + sound/soc/amd/acp/acp-pci.c | 160 ++++++ + sound/soc/amd/acp/acp-pdm.c | 193 +++++++ + sound/soc/amd/acp/acp-renoir.c | 160 ++++++ + sound/soc/amd/acp/acp-sof-mach.c | 14 + + sound/soc/amd/acp/amd.h | 23 +- + sound/soc/amd/acp/chip_offset_byte.h | 26 + + sound/soc/amd/mach-config.h | 1 + + sound/soc/amd/renoir/rn-pci-acp3x.c | 7 +- + sound/soc/amd/renoir/rn_acp3x.h | 3 + + sound/soc/codecs/Kconfig | 22 +- + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/cs42l42.c | 166 +++++- + sound/soc/codecs/cs42l42.h | 7 +- + sound/soc/codecs/cs42l51-i2c.c | 4 +- + sound/soc/codecs/cs42l51.c | 11 +- + sound/soc/codecs/cs42l51.h | 2 +- + sound/soc/codecs/lpass-rx-macro.c | 2 + + sound/soc/codecs/lpass-tx-macro.c | 2 + + sound/soc/codecs/lpass-wsa-macro.c | 2 + + sound/soc/codecs/max98927.c | 1 + + sound/soc/codecs/tas5805m.c | 567 +++++++++++++++++++++ + sound/soc/codecs/tlv320aic31xx.c | 2 +- + sound/soc/codecs/wm8962.c | 21 +- + sound/soc/codecs/wm8971.c | 5 +- + sound/soc/fsl/fsl-asoc-card.c | 7 +- + sound/soc/fsl/fsl_sai.c | 9 + + sound/soc/fsl/fsl_sai.h | 1 + + sound/soc/generic/simple-card-utils.c | 86 +++- + sound/soc/intel/boards/sof_rt5682.c | 55 +- + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 6 + + sound/soc/rockchip/rk3399_gru_sound.c | 20 + + sound/soc/samsung/idma.c | 5 +- + sound/soc/samsung/midas_wm1811.c | 1 + + sound/soc/sh/rz-ssi.c | 109 ++-- + sound/soc/soc-generic-dmaengine-pcm.c | 10 +- + sound/soc/soc-topology.c | 103 +--- + sound/soc/sof/amd/acp-trace.c | 38 +- + sound/soc/sof/amd/acp.h | 3 +- + sound/soc/sof/compress.c | 273 +++++++++- + sound/soc/sof/intel/cnl.c | 6 +- + sound/soc/sof/intel/hda-dai.c | 103 ++-- + sound/soc/sof/intel/hda-dsp.c | 14 +- + sound/soc/sof/intel/hda-ipc.c | 10 +- + sound/soc/sof/intel/hda-loader.c | 118 +++-- + sound/soc/sof/intel/hda-pcm.c | 12 +- + sound/soc/sof/intel/hda-probes.c | 34 +- + sound/soc/sof/intel/hda-stream.c | 122 ++--- + sound/soc/sof/intel/hda-trace.c | 23 +- + sound/soc/sof/intel/hda.c | 22 +- + sound/soc/sof/intel/hda.h | 26 +- + sound/soc/sof/ipc.c | 24 +- + sound/soc/sof/ops.h | 4 +- + sound/soc/sof/sof-priv.h | 5 +- + sound/soc/sof/trace.c | 8 +- + sound/soc/sunxi/sun4i-i2s.c | 68 ++- + sound/soc/tegra/tegra210_ahub.c | 146 +++++- + sound/soc/tegra/tegra210_ahub.h | 4 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 25 + + sound/soc/xilinx/xlnx_i2s.c | 147 ++++-- + 95 files changed, 2932 insertions(+), 623 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt + create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml + create mode 100644 Documentation/devicetree/bindings/sound/tas5805m.yaml + delete mode 100644 include/dt-bindings/sound/tlv320aic31xx-micbias.h + create mode 100644 include/dt-bindings/sound/tlv320aic31xx.h + create mode 100644 sound/soc/amd/acp/acp-pci.c + create mode 100644 sound/soc/amd/acp/acp-pdm.c + create mode 100644 sound/soc/codecs/tas5805m.c +Merging modules/modules-next (a97ac8cb24a3 module: fix signature check failures when using in-kernel decompression) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (994673dc6657 Input: mtk-pmic-keys - add support for MT6358) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging MAINTAINERS +Auto-merging drivers/input/joystick/analog.c +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/input/misc/axp20x-pek.c +CONFLICT (content): Merge conflict in drivers/input/misc/axp20x-pek.c +Auto-merging drivers/input/touchscreen/elants_i2c.c +Auto-merging drivers/input/touchscreen/goodix.c +Auto-merging drivers/input/touchscreen/goodix.c +Auto-merging drivers/input/touchscreen/goodix.h +Auto-merging drivers/input/touchscreen/zinitix.c +Auto-merging kernel/reboot.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/mtk-pmic-keys.txt | 5 +- + drivers/input/keyboard/mtk-pmic-keys.c | 55 ++++++++++++++++++++-- + 2 files changed, 55 insertions(+), 5 deletions(-) +Merging block/for-next (23a3fe5e6bb5 Merge branch 'for-5.18/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging MAINTAINERS +Auto-merging arch/m68k/bvme6000/config.c +Auto-merging arch/m68k/kernel/setup_mm.c +Auto-merging arch/m68k/mvme147/config.c +Auto-merging arch/m68k/mvme16x/config.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/f2fs/data.c +Auto-merging security/integrity/ima/ima_policy.c +Merge made by the 'ort' strategy. + Documentation/block/biodoc.rst | 5 - + Documentation/block/capability.rst | 2 +- + MAINTAINERS | 1 + + arch/m68k/atari/stdma.c | 1 - + arch/m68k/bvme6000/config.c | 1 - + arch/m68k/emu/nfblock.c | 1 - + arch/m68k/kernel/setup_mm.c | 1 - + arch/m68k/mvme147/config.c | 1 - + arch/m68k/mvme16x/config.c | 1 - + block/Kconfig | 12 ++ + block/bdev.c | 9 +- + block/bio-integrity.c | 1 - + block/bio.c | 181 +++++++++++++--------- + block/blk-cgroup.c | 1 - + block/blk-core.c | 8 +- + block/blk-crypto.c | 1 - + block/blk-flush.c | 4 +- + block/blk-lib.c | 32 +--- + block/blk-mq-tag.c | 2 +- + block/blk-mq.c | 4 +- + block/blk-zoned.c | 14 +- + block/blk.h | 6 +- + block/bounce.c | 9 +- + block/disk-events.c | 2 +- + block/fops.c | 35 ++--- + block/genhd.c | 7 +- + block/holder.c | 2 +- + block/partitions/check.h | 1 - + block/partitions/core.c | 1 - + block/partitions/efi.h | 1 - + block/partitions/ldm.h | 1 - + block/sed-opal.c | 2 +- + drivers/base/class.c | 2 +- + drivers/base/core.c | 2 +- + drivers/base/devtmpfs.c | 2 +- + drivers/block/aoe/aoeblk.c | 1 - + drivers/block/aoe/aoecmd.c | 1 - + drivers/block/drbd/drbd_actlog.c | 5 +- + drivers/block/drbd/drbd_bitmap.c | 7 +- + drivers/block/drbd/drbd_int.h | 1 - + drivers/block/drbd/drbd_receiver.c | 32 +--- + drivers/block/drbd/drbd_req.c | 5 +- + drivers/block/drbd/drbd_worker.c | 4 +- + drivers/block/floppy.c | 4 +- + drivers/block/mtip32xx/mtip32xx.c | 1 - + drivers/block/mtip32xx/mtip32xx.h | 1 - + drivers/block/pktcdvd.c | 12 +- + drivers/block/rnbd/rnbd-clt.c | 26 ++-- + drivers/block/rnbd/rnbd-clt.h | 1 - + drivers/block/rnbd/rnbd-proto.h | 4 +- + drivers/block/rnbd/rnbd-srv-dev.c | 61 +------- + drivers/block/rnbd/rnbd-srv-dev.h | 18 +-- + drivers/block/rnbd/rnbd-srv-sysfs.c | 1 - + drivers/block/rnbd/rnbd-srv.c | 46 +++--- + drivers/block/rnbd/rnbd-srv.h | 1 - + drivers/block/sunvdc.c | 1 - + drivers/block/xen-blkback/blkback.c | 25 +--- + drivers/block/zram/zram_drv.c | 17 +-- + drivers/cdrom/gdrom.c | 1 - + drivers/char/random.c | 2 +- + drivers/md/bcache/io.c | 3 +- + drivers/md/bcache/journal.c | 16 +- + drivers/md/bcache/movinggc.c | 4 +- + drivers/md/bcache/request.c | 22 ++- + drivers/md/bcache/super.c | 9 +- + drivers/md/bcache/writeback.c | 4 +- + drivers/md/dm-cache-target.c | 26 ++-- + drivers/md/dm-core.h | 1 - + drivers/md/dm-crypt.c | 36 ++--- + drivers/md/dm-io.c | 5 +- + drivers/md/dm-log-writes.c | 39 +---- + drivers/md/dm-snap.c | 21 +-- + drivers/md/dm-thin.c | 41 ++--- + drivers/md/dm-writecache.c | 7 +- + drivers/md/dm-zoned-metadata.c | 26 +--- + drivers/md/dm-zoned-target.c | 3 +- + drivers/md/dm.c | 172 ++++++++------------- + drivers/md/md-faulty.c | 4 +- + drivers/md/md-multipath.c | 4 +- + drivers/md/md.c | 29 ++-- + drivers/md/raid1.c | 42 +++--- + drivers/md/raid10.c | 30 ++-- + drivers/md/raid5-cache.c | 19 +-- + drivers/md/raid5-ppl.c | 13 +- + drivers/md/raid5.c | 16 +- + drivers/mtd/mtdswap.c | 2 +- + drivers/mtd/nand/raw/sharpsl.c | 1 - + drivers/nvdimm/blk.c | 1 - + drivers/nvdimm/btt.c | 1 - + drivers/nvdimm/btt_devs.c | 1 - + drivers/nvdimm/bus.c | 1 - + drivers/nvdimm/nd_virtio.c | 6 +- + drivers/nvdimm/pfn_devs.c | 1 - + drivers/nvme/target/io-cmd-bdev.c | 18 +-- + drivers/nvme/target/passthru.c | 7 +- + drivers/nvme/target/zns.c | 14 +- + drivers/s390/block/dasd_int.h | 1 - + drivers/s390/block/scm_blk.c | 1 - + drivers/s390/block/scm_blk.h | 1 - + drivers/scsi/scsi_debug.c | 1 - + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/scsicam.c | 1 - + drivers/scsi/sd.c | 1 - + drivers/scsi/sr.h | 1 - + drivers/scsi/ufs/ufshpb.c | 4 +- + drivers/target/target_core_iblock.c | 12 +- + drivers/target/target_core_pscsi.c | 1 - + fs/btrfs/check-integrity.c | 1 - + fs/btrfs/disk-io.c | 10 +- + fs/btrfs/extent_io.c | 6 +- + fs/buffer.c | 14 +- + fs/crypto/bio.c | 13 +- + fs/dax.c | 1 - + fs/direct-io.c | 5 +- + fs/erofs/zdata.c | 5 +- + fs/ext4/page-io.c | 3 +- + fs/ext4/readpage.c | 8 +- + fs/f2fs/data.c | 7 +- + fs/fs-writeback.c | 6 +- + fs/gfs2/lops.c | 8 +- + fs/gfs2/meta_io.c | 4 +- + fs/gfs2/ops_fstype.c | 4 +- + fs/gfs2/sys.c | 2 +- + fs/hfs/mdb.c | 2 +- + fs/hfsplus/wrapper.c | 5 +- + fs/io_uring.c | 183 ++++++++++------------- + fs/iomap/buffered-io.c | 26 ++-- + fs/iomap/direct-io.c | 8 +- + fs/jfs/jfs_logmgr.c | 11 +- + fs/jfs/jfs_metapage.c | 9 +- + fs/ksmbd/vfs.c | 1 - + fs/mpage.c | 34 +---- + fs/nfs/blocklayout/blocklayout.c | 26 +--- + fs/nfs/blocklayout/rpc_pipefs.c | 1 - + fs/nfsd/blocklayout.c | 1 - + fs/nilfs2/segbuf.c | 31 +--- + fs/ntfs3/fsntfs.c | 36 +---- + fs/ocfs2/cluster/heartbeat.c | 4 +- + fs/squashfs/block.c | 11 +- + fs/xfs/xfs_bio_io.c | 14 +- + fs/xfs/xfs_buf.c | 4 +- + fs/xfs/xfs_log.c | 14 +- + fs/zonefs/super.c | 9 +- + include/linux/bio.h | 36 +++-- + include/linux/blk_types.h | 7 + + include/linux/blkdev.h | 291 ++++++++++++++++++++++++++++++++++-- + include/linux/genhd.h | 291 ------------------------------------ + include/linux/part_stat.h | 2 +- + include/linux/sbitmap.h | 51 ++----- + include/trace/events/io_uring.h | 13 +- + init/do_mounts.c | 1 - + kernel/exit.c | 2 +- + kernel/power/hibernate.c | 1 - + kernel/power/swap.c | 6 +- + kernel/sched/core.c | 7 +- + lib/sbitmap.c | 40 +++-- + mm/page_io.c | 10 +- + security/integrity/ima/ima_policy.c | 1 - + 158 files changed, 1013 insertions(+), 1578 deletions(-) + delete mode 100644 include/linux/genhd.h +Merging device-mapper/for-next (eaac0b590a47 dm sysfs: use default_groups in kobj_type) +$ 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 +Already up to date. +Merging libata/for-next (0c72a87889d6 libata: make ata_host_suspend() *void*) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Auto-merging drivers/ata/libata-core.c +Auto-merging include/linux/libata.h +Merge made by the 'ort' strategy. + drivers/ata/ahci.c | 5 ++++- + drivers/ata/ata_piix.c | 5 +---- + drivers/ata/libahci_platform.c | 3 ++- + drivers/ata/libata-acpi.c | 21 ------------------ + drivers/ata/libata-core.c | 10 +++------ + drivers/ata/libata-eh.c | 7 +----- + drivers/ata/libata-scsi.c | 47 ++++++++--------------------------------- + drivers/ata/libata-sff.c | 7 +++--- + drivers/ata/libata.h | 2 -- + drivers/ata/pata_arasan_cf.c | 3 ++- + drivers/ata/pata_atiixp.c | 4 ++-- + drivers/ata/pata_cs5520.c | 5 +---- + drivers/ata/pata_imx.c | 15 ++++++------- + drivers/ata/pata_macio.c | 6 +----- + drivers/ata/pata_mpc52xx.c | 3 ++- + drivers/ata/pata_pdc202xx_old.c | 2 +- + drivers/ata/pata_platform.c | 18 ++++++---------- + drivers/ata/pata_samsung_cf.c | 3 ++- + drivers/ata/pata_triflex.c | 5 +---- + drivers/ata/sata_fsl.c | 4 +++- + drivers/ata/sata_highbank.c | 3 ++- + drivers/ata/sata_mv.c | 6 +++--- + drivers/ata/sata_rcar.c | 18 +++++++--------- + include/linux/libata.h | 2 +- + 24 files changed, 64 insertions(+), 140 deletions(-) +Merging pcmcia/pcmcia-next (3928cf08334e pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Merge made by the 'ort' strategy. + drivers/pcmcia/Kconfig | 2 +- + drivers/pcmcia/rsrc_nonstatic.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mmc/next (7fd1f3ba20b7 mmc: core: use sysfs_emit() instead of sprintf()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 4 + + .../devicetree/bindings/mmc/litex,mmc.yaml | 78 +++ + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 3 + + .../devicetree/bindings/mmc/sdhci-msm.txt | 1 + + MAINTAINERS | 9 +- + drivers/mmc/core/bus.c | 9 +- + drivers/mmc/core/bus.h | 3 +- + drivers/mmc/core/mmc.c | 16 +- + drivers/mmc/core/sd.c | 25 +- + drivers/mmc/core/sdio.c | 5 +- + drivers/mmc/core/sdio_bus.c | 7 +- + drivers/mmc/host/Kconfig | 13 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/davinci_mmc.c | 6 +- + drivers/mmc/host/dw_mmc.c | 5 +- + drivers/mmc/host/litex_mmc.c | 661 +++++++++++++++++++++ + drivers/mmc/host/sdhci-of-at91.c | 6 +- + drivers/mmc/host/sdhci-pci-gli.c | 86 ++- + drivers/mmc/host/sdhci-tegra.c | 15 +- + drivers/mmc/host/sunxi-mmc.c | 9 + + drivers/mmc/host/wmt-sdmmc.c | 7 +- + 21 files changed, 911 insertions(+), 58 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/litex,mmc.yaml + create mode 100644 drivers/mmc/host/litex_mmc.c +Merging mfd/for-mfd-next (9cb74781a436 mfd: intel_soc_pmic_crc: Set main IRQ domain bus token to DOMAIN_BUS_NEXUS) +$ 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 +Merge made by the 'ort' strategy. + drivers/mfd/intel_soc_pmic_core.c | 4 ++++ + drivers/mfd/intel_soc_pmic_crc.c | 35 ++++++++++++++++++++++------------- + 2 files changed, 26 insertions(+), 13 deletions(-) +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 +Already up to date. +Merging battery/for-next (784056d36f27 power: supply: axp288_fuel_gauge: Fix spelling mistake "resisitor" -> "resistor") +$ 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 +Merge made by the 'ort' strategy. + drivers/extcon/Kconfig | 2 + + drivers/extcon/extcon-intel-cht-wc.c | 240 ++++++++++++++++-- + drivers/i2c/busses/i2c-cht-wc.c | 120 +++++++-- + drivers/mfd/intel_soc_pmic_chtwc.c | 40 +++ + drivers/power/reset/gemini-poweroff.c | 4 +- + drivers/power/supply/axp20x_battery.c | 13 +- + drivers/power/supply/axp288_fuel_gauge.c | 259 ++++++++++--------- + drivers/power/supply/bq24190_charger.c | 12 +- + drivers/power/supply/bq25890_charger.c | 396 ++++++++++++++++++++++++------ + drivers/power/supply/cpcap-battery.c | 118 +++++++-- + drivers/power/supply/cros_usbpd-charger.c | 2 +- + drivers/power/supply/mp2629_charger.c | 6 +- + drivers/power/supply/power_supply_core.c | 57 +++-- + include/linux/mfd/intel_soc_pmic.h | 8 + + include/linux/power/bq25890_charger.h | 15 ++ + include/linux/power_supply.h | 5 +- + 16 files changed, 973 insertions(+), 324 deletions(-) + create mode 100644 include/linux/power/bq25890_charger.h +Merging regulator/for-next (e2a01b4e8806 regulator: Add support for TPS6286x) +$ 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 drivers/regulator/Kconfig +Merge made by the 'ort' strategy. + .../bindings/regulator/maxim,max8973.yaml | 5 +- + .../devicetree/bindings/regulator/pfuze100.yaml | 6 +- + .../devicetree/bindings/regulator/ti,tps62864.yaml | 62 +++++ + drivers/regulator/Kconfig | 10 + + drivers/regulator/Makefile | 1 + + drivers/regulator/qcom_smd-regulator.c | 4 +- + drivers/regulator/rpi-panel-attiny-regulator.c | 291 +++++++++++++++++---- + drivers/regulator/tps6286x-regulator.c | 159 +++++++++++ + drivers/spi/spi-geni-qcom.c | 7 +- + include/dt-bindings/regulator/ti,tps62864.h | 9 + + 10 files changed, 500 insertions(+), 54 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps62864.yaml + create mode 100644 drivers/regulator/tps6286x-regulator.c + create mode 100644 include/dt-bindings/regulator/ti,tps62864.h +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 +Auto-merging security/commoncap.c +Merge made by the 'ort' strategy. +Merging apparmor/apparmor-next (364bd29902ae apparmor: Fix some kernel-doc comments) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging MAINTAINERS +Auto-merging security/apparmor/lsm.c +Merge made by the 'ort' strategy. + MAINTAINERS | 7 ++- + security/apparmor/Kconfig | 86 ++++++++++++++++++++++++---------- + security/apparmor/apparmorfs.c | 36 ++++++++------ + security/apparmor/audit.c | 2 +- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/apparmorfs.h | 14 ++++++ + security/apparmor/include/lib.h | 5 ++ + security/apparmor/label.c | 11 +++-- + security/apparmor/lib.c | 2 +- + security/apparmor/lsm.c | 23 +++++---- + security/apparmor/mount.c | 11 +++-- + security/apparmor/policy.c | 35 ++++++++------ + security/apparmor/policy_unpack.c | 29 +++++++----- + security/apparmor/policy_unpack_test.c | 34 +++++++------- + security/apparmor/procattr.c | 2 +- + 15 files changed, 191 insertions(+), 107 deletions(-) +Merging integrity/next-integrity (e27cd859ac8c MAINTAINERS: add missing "security/integrity" directory) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Auto-merging MAINTAINERS +Auto-merging security/integrity/ima/ima_policy.c +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +++ + security/integrity/ima/ima_api.c | 2 +- + security/integrity/ima/ima_main.c | 2 +- + security/integrity/ima/ima_policy.c | 2 +- + security/integrity/ima/ima_template_lib.c | 2 +- + 5 files changed, 7 insertions(+), 4 deletions(-) +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +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 (70f4169ab421 selinux: parse contexts for mount options early) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/security.c +Merge made by the 'ort' strategy. + security/security.c | 17 ++- + security/selinux/hooks.c | 201 +++++++++++++----------------------- + security/selinux/ibpkey.c | 2 +- + security/selinux/include/security.h | 8 +- + security/selinux/netnode.c | 9 +- + security/selinux/netport.c | 2 +- + security/selinux/selinuxfs.c | 2 + + security/selinux/ss/avtab.c | 6 +- + security/selinux/ss/ebitmap.h | 6 +- + security/selinux/ss/policydb.c | 4 +- + security/selinux/ss/services.c | 8 +- + security/selinux/ss/sidtab.c | 4 +- + 12 files changed, 111 insertions(+), 158 deletions(-) +Merging smack/next (e783362eb54c Linux 5.17-rc1) +$ 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 (a33f5c380c4b Merge tag 'xfs-5.17-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (ffd264bd152c 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 +Already up to date. +Merging iommu/next (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (b4ba994f2622 dt-bindings: ltk050h3146w: replace Heiko Stuebner by myself as maintainer) +$ 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 Documentation/devicetree/bindings/firmware/arm,scmi.yaml +Auto-merging Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml +Auto-merging Documentation/devicetree/bindings/memory-controllers/samsung,exynos5422-dmc.yaml +Auto-merging Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/arm,cci-400.yaml | 5 + + Documentation/devicetree/bindings/arm/cpus.yaml | 2 + + .../devicetree/bindings/arm/idle-states.yaml | 80 ++++---- + Documentation/devicetree/bindings/arm/pmu.yaml | 2 + + .../devicetree/bindings/ata/sata_highbank.yaml | 3 + + .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 5 +- + .../devicetree/bindings/clock/ti/ti,clksel.yaml | 51 +++++ + .../bindings/crypto/intel,ixp4xx-crypto.yaml | 15 +- + .../allwinner,sun4i-a10-display-engine.yaml | 2 + + .../bindings/display/exynos/exynos-mic.txt | 51 ----- + .../bindings/display/exynos/exynos5433-decon.txt | 60 ------ + .../bindings/display/exynos/exynos7-decon.txt | 65 ------ + .../bindings/display/exynos/exynos_hdmi.txt | 64 ------ + .../bindings/display/exynos/exynos_hdmiddc.txt | 15 -- + .../bindings/display/exynos/exynos_hdmiphy.txt | 15 -- + .../bindings/display/exynos/exynos_mixer.txt | 26 --- + .../bindings/display/exynos/samsung-fimd.txt | 107 ---------- + .../bindings/display/mediatek/mediatek,hdmi.yaml | 5 +- + .../devicetree/bindings/display/msm/gpu.yaml | 2 + + .../devicetree/bindings/display/msm/mdp4.txt | 114 ----------- + .../devicetree/bindings/display/msm/mdp4.yaml | 124 +++++++++++ + .../display/panel/leadtek,ltk050h3146w.yaml | 2 +- + .../devicetree/bindings/display/renesas,du.yaml | 10 +- + .../bindings/display/rockchip/rockchip-drm.yaml | 2 + + .../display/samsung/samsung,exynos-hdmi-ddc.yaml | 42 ++++ + .../display/samsung/samsung,exynos-hdmi.yaml | 227 +++++++++++++++++++++ + .../display/samsung/samsung,exynos-mixer.yaml | 143 +++++++++++++ + .../display/samsung/samsung,exynos5433-decon.yaml | 148 ++++++++++++++ + .../display/samsung/samsung,exynos5433-mic.yaml | 95 +++++++++ + .../display/samsung/samsung,exynos7-decon.yaml | 120 +++++++++++ + .../bindings/display/samsung/samsung,fimd.yaml | 198 ++++++++++++++++++ + .../display/sprd/sprd,display-subsystem.yaml | 2 + + .../bindings/display/ti/ti,am65x-dss.yaml | 3 +- + .../devicetree/bindings/dma/dma-router.yaml | 2 + + .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 2 +- + .../bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml | 85 ++++++++ + .../devicetree/bindings/dma/xilinx/zynqmp_dma.txt | 26 --- + .../bindings/dvfs/performance-domain.yaml | 1 - + .../devicetree/bindings/firmware/arm,scmi.yaml | 2 +- + .../devicetree/bindings/firmware/arm,scpi.yaml | 2 +- + Documentation/devicetree/bindings/i2c/i2c-imx.yaml | 7 +- + Documentation/devicetree/bindings/i2c/i2c-mpc.yaml | 2 + + .../devicetree/bindings/i2c/i2c-s3c2410.txt | 58 ------ + .../devicetree/bindings/i2c/ingenic,i2c.yaml | 4 +- + .../bindings/i2c/samsung,s3c2410-i2c.yaml | 164 +++++++++++++++ + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 24 ++- + .../bindings/interconnect/qcom,rpmh.yaml | 2 + + .../bindings/interrupt-controller/arm,gic-v3.yaml | 6 +- + .../bindings/interrupt-controller/ti,sci-inta.yaml | 2 + + .../devicetree/bindings/iommu/mediatek,iommu.yaml | 6 +- + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 6 + + .../bindings/leds/backlight/led-backlight.yaml | 2 + + .../media/allwinner,sun4i-a10-video-engine.yaml | 4 + + .../bindings/media/nxp,imx8mq-mipi-csi2.yaml | 10 +- + .../devicetree/bindings/media/ti,cal.yaml | 4 + + .../memory-controllers/mediatek,smi-larb.yaml | 2 +- + .../memory-controllers/samsung,exynos5422-dmc.yaml | 2 + + .../bindings/net/allwinner,sun4i-a10-emac.yaml | 4 + + .../devicetree/bindings/net/can/bosch,c_can.yaml | 8 +- + .../devicetree/bindings/net/can/bosch,m_can.yaml | 1 + + .../devicetree/bindings/net/can/fsl,flexcan.yaml | 12 +- + .../bindings/net/cortina,gemini-ethernet.txt | 92 --------- + .../bindings/net/cortina,gemini-ethernet.yaml | 137 +++++++++++++ + .../devicetree/bindings/net/dsa/dsa-port.yaml | 2 + + Documentation/devicetree/bindings/net/fsl,fec.yaml | 8 +- + .../bindings/net/intel,ixp4xx-ethernet.yaml | 15 +- + .../devicetree/bindings/net/intel,ixp4xx-hss.yaml | 33 ++- + .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 4 + + .../bindings/net/socionext,uniphier-ave4.yaml | 4 + + .../devicetree/bindings/net/stm32-dwmac.yaml | 4 + + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 5 + + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 6 - + .../bindings/net/wireless/mediatek,mt76.yaml | 4 + + .../devicetree/bindings/nvmem/qcom,spmi-sdam.yaml | 28 --- + .../devicetree/bindings/opp/opp-v2-base.yaml | 2 + + .../devicetree/bindings/perf/arm,dsu-pmu.yaml | 2 + + .../devicetree/bindings/phy/intel,combo-phy.yaml | 8 + + .../bindings/phy/samsung,exynos-hdmi-phy.yaml | 44 ++++ + .../devicetree/bindings/phy/ti,omap-usb2.yaml | 4 + + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 2 + + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 4 + + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 2 + + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 10 +- + .../devicetree/bindings/power/power-domain.yaml | 4 + + .../devicetree/bindings/power/renesas,apmu.yaml | 2 + + .../bindings/power/rockchip,power-controller.yaml | 2 + + .../bindings/power/supply/cw2015_battery.yaml | 6 +- + .../bindings/power/supply/power-supply.yaml | 2 + + .../devicetree/bindings/regulator/regulator.yaml | 2 + + .../bindings/regulator/st,stm32-booster.yaml | 2 +- + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 6 + + .../bindings/remoteproc/st,stm32-rproc.yaml | 33 ++- + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 10 + + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 10 + + .../bindings/remoteproc/ti,omap-remoteproc.yaml | 19 +- + .../devicetree/bindings/rng/atmel,at91-trng.yaml | 2 +- + .../devicetree/bindings/serial/rda,8810pl-uart.txt | 17 -- + .../bindings/serial/rda,8810pl-uart.yaml | 46 +++++ + .../bindings/soc/samsung/exynos-usi.yaml | 4 + + .../bindings/sound/amlogic,gx-sound-card.yaml | 4 +- + .../bindings/sound/google,sc7180-trogdor.yaml | 6 +- + .../devicetree/bindings/sound/imx-audio-card.yaml | 7 +- + .../devicetree/bindings/sound/qcom,sm8250.yaml | 10 +- + .../bindings/sound/samsung,aries-wm8994.yaml | 3 +- + .../bindings/sound/samsung,midas-audio.yaml | 2 - + .../devicetree/bindings/sound/samsung,odroid.yaml | 9 +- + .../devicetree/bindings/sound/sound-dai.yaml | 20 ++ + .../devicetree/bindings/sound/st,stm32-sai.yaml | 8 +- + .../bindings/thermal/thermal-cooling-devices.yaml | 6 +- + .../devicetree/bindings/thermal/thermal-idle.yaml | 8 +- + .../bindings/timer/nuvoton,npcm7xx-timer.txt | 21 -- + .../bindings/timer/nuvoton,npcm7xx-timer.yaml | 46 +++++ + .../devicetree/bindings/trivial-devices.yaml | 8 +- + .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 +- + .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 8 +- + MAINTAINERS | 4 +- + scripts/dtc/Makefile | 2 +- + 118 files changed, 2082 insertions(+), 936 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,clksel.yaml + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos-mic.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos5433-decon.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos_hdmiddc.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos_hdmiphy.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos_mixer.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt + delete mode 100644 Documentation/devicetree/bindings/display/msm/mdp4.txt + create mode 100644 Documentation/devicetree/bindings/display/msm/mdp4.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi-ddc.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos-mixer.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-decon.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-mic.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos7-decon.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,fimd.yaml + create mode 100644 Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/xilinx/zynqmp_dma.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt + create mode 100644 Documentation/devicetree/bindings/i2c/samsung,s3c2410-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt + create mode 100644 Documentation/devicetree/bindings/net/cortina,gemini-ethernet.yaml + create mode 100644 Documentation/devicetree/bindings/phy/samsung,exynos-hdmi-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/rda,8810pl-uart.yaml + create mode 100644 Documentation/devicetree/bindings/sound/sound-dai.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/nuvoton,npcm7xx-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/nuvoton,npcm7xx-timer.yaml +Merging mailbox/mailbox-for-next (869b6ca39c08 dt-bindings: mailbox: Add more protocol and client ID) +$ 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 (2cbfa2128662 spi: make remove callback a void function) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/adt7310.c +CONFLICT (content): Merge conflict in drivers/hwmon/adt7310.c +Auto-merging drivers/mtd/devices/mchp23k256.c +Auto-merging drivers/mtd/devices/mchp48l640.c +Auto-merging drivers/net/ieee802154/at86rf230.c +Auto-merging drivers/net/ieee802154/ca8210.c +Auto-merging drivers/net/ieee802154/mcr20a.c +Auto-merging drivers/net/wireless/microchip/wilc1000/spi.c +Auto-merging drivers/spi/spi-mt65xx.c +Auto-merging drivers/staging/fbtft/fbtft.h +Auto-merging drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c +Auto-merging drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c +Auto-merging drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c +Recorded preimage for 'drivers/hwmon/adt7310.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/hwmon/adt7310.c'. +[master 99a46e2f4aa4] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/spi/mediatek,spi-mt65xx.yaml | 102 ++++ + .../bindings/spi/mediatek,spi-mtk-nor.yaml | 4 + + .../bindings/spi/mediatek,spi-slave-mt27xx.yaml | 58 ++ + .../bindings/spi/microchip,mpfs-spi.yaml | 52 ++ + .../devicetree/bindings/spi/spi-mt65xx.txt | 68 --- + .../devicetree/bindings/spi/spi-slave-mt27xx.txt | 33 -- + .../bindings/spi/spi-sunplus-sp7021.yaml | 79 +++ + Documentation/spi/pxa2xx.rst | 3 - + MAINTAINERS | 7 + + arch/arm/mach-pxa/corgi.c | 26 +- + arch/arm/mach-pxa/hx4700.c | 10 +- + arch/arm/mach-pxa/icontrol.c | 26 +- + arch/arm/mach-pxa/littleton.c | 10 +- + arch/arm/mach-pxa/magician.c | 12 +- + arch/arm/mach-pxa/poodle.c | 14 +- + arch/arm/mach-pxa/spitz.c | 26 +- + arch/arm/mach-pxa/stargate2.c | 20 +- + arch/arm/mach-pxa/z2.c | 20 +- + arch/arm/mach-s3c/Kconfig | 12 - + arch/arm/mach-s3c/devs.c | 77 +-- + arch/arm/mach-s3c/mach-crag6410-module.c | 13 - + arch/arm/mach-s3c/mach-crag6410.c | 13 +- + arch/arm/mach-s3c/setup-spi-s3c64xx.c | 9 - + arch/arm/mach-s3c/spi-core-s3c24xx.h | 6 - + drivers/bus/moxtet.c | 4 +- + drivers/char/tpm/st33zp24/i2c.c | 5 +- + drivers/char/tpm/st33zp24/spi.c | 9 +- + drivers/char/tpm/st33zp24/st33zp24.c | 3 +- + drivers/char/tpm/st33zp24/st33zp24.h | 2 +- + drivers/char/tpm/tpm_tis_spi_main.c | 3 +- + drivers/clk/clk-lmk04832.c | 4 +- + drivers/gpio/gpio-74x164.c | 4 +- + drivers/gpio/gpio-max3191x.c | 4 +- + drivers/gpio/gpio-max7301.c | 4 +- + drivers/gpio/gpio-mc33880.c | 4 +- + drivers/gpio/gpio-pisosr.c | 4 +- + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 4 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 4 +- + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 3 +- + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 4 +- + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 4 +- + drivers/gpu/drm/panel/panel-lg-lg4573.c | 4 +- + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 4 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-db7430.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6d27a1.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 3 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 4 +- + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 4 +- + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 4 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 3 +- + drivers/gpu/drm/panel/panel-widechips-ws2401.c | 3 +- + drivers/gpu/drm/tiny/hx8357d.c | 4 +- + drivers/gpu/drm/tiny/ili9163.c | 4 +- + drivers/gpu/drm/tiny/ili9225.c | 4 +- + drivers/gpu/drm/tiny/ili9341.c | 4 +- + drivers/gpu/drm/tiny/ili9486.c | 4 +- + drivers/gpu/drm/tiny/mi0283qt.c | 4 +- + drivers/gpu/drm/tiny/repaper.c | 4 +- + drivers/gpu/drm/tiny/st7586.c | 4 +- + drivers/gpu/drm/tiny/st7735r.c | 4 +- + drivers/hwmon/adcxx.c | 4 +- + drivers/hwmon/max1111.c | 3 +- + drivers/hwmon/max31722.c | 4 +- + drivers/iio/accel/bma400_spi.c | 4 +- + drivers/iio/accel/bmc150-accel-spi.c | 4 +- + drivers/iio/accel/bmi088-accel-spi.c | 4 +- + drivers/iio/accel/kxsd9-spi.c | 4 +- + drivers/iio/accel/mma7455_spi.c | 4 +- + drivers/iio/accel/sca3000.c | 4 +- + drivers/iio/adc/ad7266.c | 4 +- + drivers/iio/adc/ltc2496.c | 4 +- + drivers/iio/adc/mcp320x.c | 4 +- + drivers/iio/adc/mcp3911.c | 4 +- + drivers/iio/adc/ti-adc12138.c | 4 +- + drivers/iio/adc/ti-ads7950.c | 4 +- + drivers/iio/adc/ti-ads8688.c | 4 +- + drivers/iio/adc/ti-tlc4541.c | 4 +- + drivers/iio/amplifiers/ad8366.c | 4 +- + drivers/iio/common/ssp_sensors/ssp_dev.c | 4 +- + drivers/iio/dac/ad5360.c | 4 +- + drivers/iio/dac/ad5380.c | 4 +- + drivers/iio/dac/ad5446.c | 4 +- + drivers/iio/dac/ad5449.c | 4 +- + drivers/iio/dac/ad5504.c | 4 +- + drivers/iio/dac/ad5592r.c | 4 +- + drivers/iio/dac/ad5624r_spi.c | 4 +- + drivers/iio/dac/ad5686-spi.c | 4 +- + drivers/iio/dac/ad5761.c | 4 +- + drivers/iio/dac/ad5764.c | 4 +- + drivers/iio/dac/ad5791.c | 4 +- + drivers/iio/dac/ad8801.c | 4 +- + drivers/iio/dac/ltc1660.c | 4 +- + drivers/iio/dac/ltc2632.c | 4 +- + drivers/iio/dac/mcp4922.c | 4 +- + drivers/iio/dac/ti-dac082s085.c | 4 +- + drivers/iio/dac/ti-dac7311.c | 3 +- + drivers/iio/frequency/adf4350.c | 4 +- + drivers/iio/gyro/bmg160_spi.c | 4 +- + drivers/iio/gyro/fxas21002c_spi.c | 4 +- + drivers/iio/health/afe4403.c | 4 +- + drivers/iio/magnetometer/bmc150_magn_spi.c | 4 +- + drivers/iio/magnetometer/hmc5843_spi.c | 4 +- + drivers/iio/potentiometer/max5487.c | 4 +- + drivers/iio/pressure/ms5611_spi.c | 4 +- + drivers/iio/pressure/zpa2326_spi.c | 4 +- + drivers/input/keyboard/applespi.c | 4 +- + drivers/input/misc/adxl34x-spi.c | 4 +- + drivers/input/touchscreen/ads7846.c | 4 +- + drivers/input/touchscreen/cyttsp4_spi.c | 4 +- + drivers/input/touchscreen/tsc2005.c | 4 +- + drivers/leds/leds-cr0014114.c | 4 +- + drivers/leds/leds-dac124s085.c | 4 +- + drivers/leds/leds-el15203000.c | 4 +- + drivers/leds/leds-spi-byte.c | 4 +- + drivers/media/spi/cxd2880-spi.c | 4 +- + drivers/media/spi/gs1662.c | 4 +- + drivers/media/tuners/msi001.c | 3 +- + drivers/mfd/arizona-spi.c | 4 +- + drivers/mfd/da9052-spi.c | 3 +- + drivers/mfd/ezx-pcap.c | 4 +- + drivers/mfd/madera-spi.c | 4 +- + drivers/mfd/mc13xxx-spi.c | 3 +- + drivers/mfd/rsmu_spi.c | 4 +- + drivers/mfd/stmpe-spi.c | 4 +- + drivers/mfd/tps65912-spi.c | 4 +- + drivers/misc/ad525x_dpot-spi.c | 3 +- + drivers/misc/eeprom/eeprom_93xx46.c | 4 +- + drivers/misc/lattice-ecp3-config.c | 4 +- + drivers/misc/lis3lv02d/lis3lv02d_spi.c | 4 +- + drivers/mmc/host/mmc_spi.c | 3 +- + drivers/mtd/devices/mchp23k256.c | 4 +- + drivers/mtd/devices/mchp48l640.c | 4 +- + drivers/mtd/devices/mtd_dataflash.c | 4 +- + drivers/mtd/devices/sst25l.c | 4 +- + drivers/net/can/m_can/tcan4x5x-core.c | 4 +- + drivers/net/can/spi/hi311x.c | 4 +- + drivers/net/can/spi/mcp251x.c | 4 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 +- + drivers/net/dsa/b53/b53_spi.c | 4 +- + drivers/net/dsa/microchip/ksz8795_spi.c | 4 +- + drivers/net/dsa/microchip/ksz9477_spi.c | 4 +- + drivers/net/dsa/sja1105/sja1105_main.c | 6 +- + drivers/net/dsa/vitesse-vsc73xx-spi.c | 6 +- + drivers/net/ethernet/asix/ax88796c_main.c | 4 +- + drivers/net/ethernet/micrel/ks8851_spi.c | 4 +- + drivers/net/ethernet/microchip/enc28j60.c | 4 +- + drivers/net/ethernet/microchip/encx24j600.c | 4 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 4 +- + drivers/net/ethernet/vertexcom/mse102x.c | 4 +- + drivers/net/ethernet/wiznet/w5100-spi.c | 4 +- + drivers/net/ieee802154/adf7242.c | 4 +- + drivers/net/ieee802154/at86rf230.c | 4 +- + drivers/net/ieee802154/ca8210.c | 6 +- + drivers/net/ieee802154/cc2520.c | 4 +- + drivers/net/ieee802154/mcr20a.c | 4 +- + drivers/net/ieee802154/mrf24j40.c | 4 +- + drivers/net/phy/spi_ks8995.c | 4 +- + drivers/net/wan/slic_ds26522.c | 3 +- + drivers/net/wireless/intersil/p54/p54spi.c | 4 +- + drivers/net/wireless/marvell/libertas/if_spi.c | 4 +- + drivers/net/wireless/microchip/wilc1000/spi.c | 4 +- + drivers/net/wireless/st/cw1200/cw1200_spi.c | 4 +- + drivers/net/wireless/ti/wl1251/spi.c | 4 +- + drivers/net/wireless/ti/wlcore/spi.c | 4 +- + drivers/nfc/nfcmrvl/spi.c | 3 +- + drivers/nfc/st-nci/spi.c | 4 +- + drivers/nfc/st95hf/core.c | 4 +- + drivers/nfc/trf7970a.c | 4 +- + drivers/platform/chrome/cros_ec.c | 4 +- + drivers/platform/chrome/cros_ec.h | 2 +- + drivers/platform/chrome/cros_ec_i2c.c | 4 +- + drivers/platform/chrome/cros_ec_lpc.c | 4 +- + drivers/platform/chrome/cros_ec_spi.c | 4 +- + drivers/platform/olpc/olpc-xo175-ec.c | 4 +- + drivers/rtc/rtc-ds1302.c | 3 +- + drivers/rtc/rtc-ds1305.c | 4 +- + drivers/rtc/rtc-ds1343.c | 4 +- + drivers/spi/Kconfig | 11 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-ath79.c | 34 ++ + drivers/spi/spi-bcm2835aux.c | 21 +- + drivers/spi/spi-mem.c | 6 +- + drivers/spi/spi-mpc512x-psc.c | 47 +- + drivers/spi/spi-mt65xx.c | 23 +- + drivers/spi/spi-mtk-nor.c | 71 ++- + drivers/spi/spi-pic32.c | 9 +- + drivers/spi/spi-pxa2xx.c | 63 +-- + drivers/spi/spi-s3c24xx.c | 47 +- + drivers/spi/spi-s3c64xx.c | 53 +- + drivers/spi/spi-slave-system-control.c | 3 +- + drivers/spi/spi-slave-time.c | 3 +- + drivers/spi/spi-st-ssc4.c | 31 +- + drivers/spi/spi-sunplus-sp7021.c | 604 +++++++++++++++++++++ + drivers/spi/spi-tegra114.c | 4 + + drivers/spi/spi-tegra210-quad.c | 2 + + drivers/spi/spi-tle62x0.c | 3 +- + drivers/spi/spi.c | 152 +++++- + drivers/spi/spidev.c | 35 +- + drivers/staging/fbtft/fbtft.h | 92 ++-- + drivers/staging/pi433/pi433_if.c | 4 +- + drivers/staging/wfx/bus_spi.c | 3 +- + drivers/tty/serial/max3100.c | 5 +- + drivers/tty/serial/max310x.c | 3 +- + drivers/tty/serial/sc16is7xx.c | 4 +- + drivers/usb/gadget/udc/max3420_udc.c | 4 +- + drivers/usb/host/max3421-hcd.c | 3 +- + drivers/video/backlight/ams369fg06.c | 3 +- + drivers/video/backlight/corgi_lcd.c | 3 +- + drivers/video/backlight/ili922x.c | 3 +- + drivers/video/backlight/l4f00242t03.c | 3 +- + drivers/video/backlight/lms501kf03.c | 3 +- + drivers/video/backlight/ltv350qv.c | 3 +- + drivers/video/backlight/tdo24m.c | 3 +- + drivers/video/backlight/tosa_lcd.c | 4 +- + drivers/video/backlight/vgg2432a4.c | 4 +- + drivers/video/fbdev/omap/lcd_mipid.c | 4 +- + .../omapfb/displays/panel-lgphilips-lb035q02.c | 4 +- + .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 4 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 4 +- + .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 4 +- + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 4 +- + include/linux/platform_data/spi-s3c64xx.h | 14 +- + include/linux/spi/pxa2xx_spi.h | 1 - + include/linux/spi/s3c24xx.h | 5 - + include/linux/spi/spi.h | 22 +- + sound/pci/hda/cs35l41_hda_spi.c | 4 +- + sound/soc/codecs/adau1761-spi.c | 3 +- + sound/soc/codecs/adau1781-spi.c | 3 +- + sound/soc/codecs/cs35l41-spi.c | 4 +- + sound/soc/codecs/pcm3168a-spi.c | 4 +- + sound/soc/codecs/pcm512x-spi.c | 3 +- + sound/soc/codecs/tlv320aic32x4-spi.c | 4 +- + sound/soc/codecs/tlv320aic3x-spi.c | 4 +- + sound/soc/codecs/wm0010.c | 4 +- + sound/soc/codecs/wm8804-spi.c | 3 +- + sound/spi/at73c213.c | 4 +- + 239 files changed, 1608 insertions(+), 1182 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/mediatek,spi-mt65xx.yaml + create mode 100644 Documentation/devicetree/bindings/spi/mediatek,spi-slave-mt27xx.yaml + create mode 100644 Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-mt65xx.txt + delete mode 100644 Documentation/devicetree/bindings/spi/spi-slave-mt27xx.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-sunplus-sp7021.yaml + create mode 100644 drivers/spi/spi-sunplus-sp7021.c +Merging tip/auto-latest (163812a9c80a Merge x86/cpu 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 MAINTAINERS +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/kvm/emulate.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/cpufreq_schedutil.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-devices-system-cpu | 4 + + Documentation/ABI/testing/sysfs-devices-system-cpu | 6 + + MAINTAINERS | 2 + + arch/x86/Kconfig | 2 +- + arch/x86/events/intel/core.c | 40 +- + arch/x86/events/intel/ds.c | 14 +- + arch/x86/events/intel/pt.c | 55 +- + arch/x86/include/asm/cpufeatures.h | 6 +- + arch/x86/include/asm/insn.h | 2 +- + arch/x86/include/asm/intel_ds.h | 5 +- + arch/x86/include/asm/kvm_host.h | 3 +- + arch/x86/include/asm/page.h | 10 + + arch/x86/include/asm/paravirt_types.h | 4 +- + arch/x86/include/asm/pci_x86.h | 8 + + arch/x86/include/asm/perf_event.h | 2 +- + arch/x86/include/asm/processor.h | 2 + + arch/x86/include/asm/topology.h | 1 + + arch/x86/kernel/cpu/amd.c | 30 - + arch/x86/kernel/cpu/common.c | 79 ++ + arch/x86/kernel/cpu/mce/amd.c | 7 +- + arch/x86/kernel/cpu/mce/core.c | 7 +- + arch/x86/kernel/cpu/mce/intel.c | 42 - + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kvm/cpuid.c | 3 +- + arch/x86/kvm/emulate.c | 4 +- + arch/x86/kvm/pmu.h | 2 - + arch/x86/kvm/vmx/pmu_intel.c | 4 +- + arch/x86/kvm/x86.c | 4 +- + arch/x86/kvm/x86.h | 7 +- + arch/x86/lib/x86-opcode-map.txt | 111 +- + arch/x86/mm/maccess.c | 7 +- + arch/x86/pci/irq.c | 372 ++++- + drivers/base/topology.c | 20 +- + include/asm-generic/bitops/instrumented-atomic.h | 12 +- + .../asm-generic/bitops/instrumented-non-atomic.h | 16 +- + include/linux/cpumask.h | 14 +- + include/linux/sched/sysctl.h | 4 - + include/linux/topology.h | 3 + + include/uapi/linux/rseq.h | 20 +- + kernel/events/core.c | 5 +- + kernel/irq/irqdesc.c | 4 +- + kernel/locking/lockdep.c | 29 +- + kernel/rseq.c | 8 +- + kernel/sched/autogroup.c | 23 + + kernel/sched/autogroup.h | 1 + + kernel/sched/core.c | 1 + + kernel/sched/cpufreq_schedutil.c | 11 +- + kernel/sched/debug.c | 10 - + kernel/sched/fair.c | 2 + + kernel/sched/sched.h | 181 +-- + kernel/softirq.c | 10 +- + kernel/sysctl.c | 11 - + tools/arch/x86/include/asm/insn.h | 2 +- + tools/arch/x86/lib/x86-opcode-map.txt | 111 +- + tools/perf/arch/x86/tests/insn-x86-dat-32.c | 918 +++++++++++++ + tools/perf/arch/x86/tests/insn-x86-dat-64.c | 1426 ++++++++++++++++++++ + tools/perf/arch/x86/tests/insn-x86-dat-src.c | 1189 ++++++++++++++++ + tools/testing/selftests/rseq/Makefile | 2 +- + .../testing/selftests/rseq/basic_percpu_ops_test.c | 2 +- + tools/testing/selftests/rseq/compiler.h | 30 + + tools/testing/selftests/rseq/param_test.c | 8 +- + tools/testing/selftests/rseq/rseq-abi.h | 151 +++ + tools/testing/selftests/rseq/rseq-arm.h | 110 +- + tools/testing/selftests/rseq/rseq-arm64.h | 79 +- + .../selftests/rseq/rseq-generic-thread-pointer.h | 25 + + tools/testing/selftests/rseq/rseq-mips.h | 71 +- + .../selftests/rseq/rseq-ppc-thread-pointer.h | 30 + + tools/testing/selftests/rseq/rseq-ppc.h | 128 +- + tools/testing/selftests/rseq/rseq-s390.h | 55 +- + tools/testing/selftests/rseq/rseq-skip.h | 2 +- + tools/testing/selftests/rseq/rseq-thread-pointer.h | 19 + + .../selftests/rseq/rseq-x86-thread-pointer.h | 40 + + tools/testing/selftests/rseq/rseq-x86.h | 200 ++- + tools/testing/selftests/rseq/rseq.c | 163 ++- + tools/testing/selftests/rseq/rseq.h | 29 +- + 75 files changed, 5263 insertions(+), 758 deletions(-) + create mode 100644 tools/testing/selftests/rseq/compiler.h + create mode 100644 tools/testing/selftests/rseq/rseq-abi.h + create mode 100644 tools/testing/selftests/rseq/rseq-generic-thread-pointer.h + create mode 100644 tools/testing/selftests/rseq/rseq-ppc-thread-pointer.h + create mode 100644 tools/testing/selftests/rseq/rseq-thread-pointer.h + create mode 100644 tools/testing/selftests/rseq/rseq-x86-thread-pointer.h +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 +Already up to date. +Merging edac/edac-for-next (59d0e09374a3 Merge branch 'edac-urgent' 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 +Merge made by the 'ort' strategy. + drivers/edac/edac_device_sysfs.c | 31 +++++++++++++++++-------------- + drivers/edac/edac_mc.c | 4 ++-- + drivers/edac/edac_pci_sysfs.c | 26 ++++++++++++++------------ + 3 files changed, 33 insertions(+), 28 deletions(-) +Merging irqchip/irq/irqchip-next (c3da358f8ef1 Merge branch irq/stm32mp13 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 +Merge made by the 'ort' strategy. + .../interrupt-controller/st,stm32-exti.yaml | 1 + + drivers/gpio/gpio-mt7621.c | 1 - + drivers/gpio/gpio-omap.c | 7 +-- + drivers/gpio/gpio-rcar.c | 2 +- + drivers/gpio/gpio-tqmx86.c | 3 +- + drivers/irqchip/irq-gic.c | 12 +++--- + drivers/irqchip/irq-imx-intmux.c | 8 ++-- + drivers/irqchip/irq-renesas-intc-irqpin.c | 3 +- + drivers/irqchip/irq-renesas-irqc.c | 3 +- + drivers/irqchip/irq-stm32-exti.c | 50 ++++++++++++++++++++++ + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 25 ++++++----- + drivers/pinctrl/pinctrl-starfive.c | 3 +- + include/linux/irq.h | 2 - + include/linux/irqdomain.h | 10 +++++ + kernel/irq/chip.c | 20 ++++++--- + 15 files changed, 110 insertions(+), 40 deletions(-) +Merging ftrace/for-next (6b9b6413700e ftrace: Fix assuming build time sort works for s390) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Already up to date. +Merging rcu/rcu/next (f589e15f9255 tools/nolibc/stdlib: implement abort()) +$ 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 33 + + .../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 + + MAINTAINERS | 2 + + include/linux/rcupdate.h | 4 +- + include/linux/rcutiny.h | 20 + + include/linux/rcutree.h | 6 +- + include/linux/rcuwait.h | 6 +- + include/linux/srcutree.h | 28 +- + include/trace/events/rcu.h | 9 +- + kernel/rcu/rcu.h | 11 + + kernel/rcu/rcu_segcblist.c | 8 +- + kernel/rcu/rcu_segcblist.h | 4 +- + kernel/rcu/rcutorture.c | 132 +- + kernel/rcu/srcutree.c | 566 +++-- + kernel/rcu/tasks.h | 11 +- + kernel/rcu/tree.c | 369 +-- + kernel/rcu/tree.h | 25 +- + kernel/rcu/tree_exp.h | 170 +- + kernel/rcu/tree_nocb.h | 18 +- + kernel/rcu/tree_plugin.h | 31 +- + kernel/rcu/tree_stall.h | 35 + + kernel/rcu/update.c | 7 + + kernel/time/Kconfig | 9 + + kernel/time/clocksource.c | 8 +- + kernel/time/tick-sched.c | 17 + + kernel/time/tick-sched.h | 4 + + kernel/torture.c | 6 +- + mm/slab.c | 5 +- + mm/slob.c | 2 + + mm/slub.c | 5 +- + tools/include/nolibc/arch-aarch64.h | 200 ++ + tools/include/nolibc/arch-arm.h | 205 ++ + tools/include/nolibc/arch-i386.h | 197 ++ + tools/include/nolibc/arch-mips.h | 216 ++ + tools/include/nolibc/arch-riscv.h | 205 ++ + tools/include/nolibc/arch-x86_64.h | 216 ++ + tools/include/nolibc/arch.h | 32 + + tools/include/nolibc/ctype.h | 99 + + tools/include/nolibc/errno.h | 27 + + tools/include/nolibc/nolibc.h | 2540 +------------------- + tools/include/nolibc/signal.h | 22 + + tools/include/nolibc/std.h | 49 + + tools/include/nolibc/stdio.h | 296 +++ + tools/include/nolibc/stdlib.h | 311 +++ + tools/include/nolibc/string.h | 212 ++ + tools/include/nolibc/sys.h | 1168 +++++++++ + tools/include/nolibc/time.h | 28 + + tools/include/nolibc/types.h | 184 ++ + tools/include/nolibc/unistd.h | 54 + + tools/memory-model/Documentation/explanation.txt | 51 + + tools/memory-model/Documentation/locking.txt | 320 +++ + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 + + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 + + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 + + .../selftests/rcutorture/bin/console-badness.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-again.sh | 4 +- + .../selftests/rcutorture/bin/kvm-check-branches.sh | 4 +- + .../selftests/rcutorture/bin/kvm-end-run-stats.sh | 4 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 6 + + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 25 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 16 +- + .../selftests/rcutorture/bin/parse-console.sh | 10 + + tools/testing/selftests/rcutorture/bin/torture.sh | 56 +- + .../selftests/rcutorture/configs/rcu/RUDE01 | 2 +- + .../selftests/rcutorture/configs/rcu/SRCU-N.boot | 1 + + .../selftests/rcutorture/configs/rcu/SRCU-P.boot | 2 + + .../selftests/rcutorture/configs/rcu/TRACE01 | 2 +- + 84 files changed, 5970 insertions(+), 3032 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/include/nolibc/arch-aarch64.h + create mode 100644 tools/include/nolibc/arch-arm.h + create mode 100644 tools/include/nolibc/arch-i386.h + create mode 100644 tools/include/nolibc/arch-mips.h + create mode 100644 tools/include/nolibc/arch-riscv.h + create mode 100644 tools/include/nolibc/arch-x86_64.h + create mode 100644 tools/include/nolibc/arch.h + create mode 100644 tools/include/nolibc/ctype.h + create mode 100644 tools/include/nolibc/errno.h + create mode 100644 tools/include/nolibc/signal.h + create mode 100644 tools/include/nolibc/std.h + create mode 100644 tools/include/nolibc/stdio.h + create mode 100644 tools/include/nolibc/stdlib.h + create mode 100644 tools/include/nolibc/string.h + create mode 100644 tools/include/nolibc/sys.h + create mode 100644 tools/include/nolibc/time.h + create mode 100644 tools/include/nolibc/types.h + create mode 100644 tools/include/nolibc/unistd.h + create mode 100644 tools/memory-model/Documentation/locking.txt + 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 +Merging kvm/next (17179d0068b2 Merge tag 'kvmarm-fixes-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (00e6dae00e3d Merge branch kvm-arm64/pmu-bl 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 +Merge made by the 'ort' strategy. + Documentation/virt/kvm/devices/vcpu.rst | 34 +++- + arch/arm64/include/asm/kvm_host.h | 32 +++- + arch/arm64/include/asm/kvm_mmu.h | 4 +- + arch/arm64/include/asm/sysreg.h | 8 + + arch/arm64/include/uapi/asm/kvm.h | 4 + + arch/arm64/kernel/fpsimd.c | 8 +- + arch/arm64/kernel/image-vars.h | 3 + + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/arm.c | 127 ++++--------- + arch/arm64/kvm/debug.c | 26 ++- + arch/arm64/kvm/fpsimd.c | 14 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 4 + + arch/arm64/kvm/hyp/nvhe/Makefile | 3 +- + arch/arm64/kvm/hyp/nvhe/list_debug.c | 54 ++++++ + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 3 +- + arch/arm64/kvm/hyp/nvhe/stub.c | 22 --- + arch/arm64/kvm/mmu.c | 50 ++++-- + arch/arm64/kvm/pmu-emul.c | 141 +++++++++++---- + arch/arm64/kvm/psci.c | 6 +- + arch/arm64/kvm/sys_regs.c | 74 ++++++-- + arch/arm64/kvm/vmid.c | 196 +++++++++++++++++++++ + include/kvm/arm_pmu.h | 5 + + include/kvm/arm_psci.h | 6 +- + include/linux/perf_event.h | 2 +- + tools/arch/arm64/include/uapi/asm/kvm.h | 1 + + .../selftests/kvm/aarch64/debug-exceptions.c | 58 +++++- + tools/testing/selftests/kvm/aarch64/get-reg-list.c | 1 + + tools/testing/selftests/kvm/aarch64/vgic_irq.c | 45 +++-- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 10 ++ + tools/testing/selftests/kvm/lib/aarch64/gic_v3.c | 12 +- + tools/testing/selftests/kvm/lib/aarch64/vgic.c | 9 +- + 31 files changed, 728 insertions(+), 236 deletions(-) + create mode 100644 arch/arm64/kvm/hyp/nvhe/list_debug.c + delete mode 100644 arch/arm64/kvm/hyp/nvhe/stub.c + create mode 100644 arch/arm64/kvm/vmid.c +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 (e25a8d959992 x86/Xen: streamline (and fix) PV CPU enumeration) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +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 +Merge made by the 'ort' strategy. +Merging workqueues/for-next (bc35f7ef9628 workqueue: Convert the type of pool->nr_running to int) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. + kernel/workqueue.c | 58 +++++++++++++++++++----------------------------------- + 1 file changed, 20 insertions(+), 38 deletions(-) +Merging drivers-x86/for-next (34fc68348554 platform/surface: surface3-wmi: Simplify resource management) +$ 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 MAINTAINERS +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging sound/pci/hda/patch_realtek.c +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +- + drivers/acpi/scan.c | 16 +- + drivers/platform/surface/surface3-wmi.c | 17 +- + drivers/platform/surface/surface_acpi_notify.c | 3 +- + drivers/platform/x86/Kconfig | 12 +- + drivers/platform/x86/Makefile | 2 +- + drivers/platform/x86/i2c-multi-instantiate.c | 174 ------------ + drivers/platform/x86/intel/hid.c | 7 +- + drivers/platform/x86/intel/int3472/discrete.c | 5 +- + drivers/platform/x86/intel/vbtn.c | 7 +- + drivers/platform/x86/serial-multi-instantiate.c | 348 ++++++++++++++++++++++++ + drivers/platform/x86/thinkpad_acpi.c | 17 +- + drivers/platform/x86/x86-android-tablets.c | 2 +- + sound/pci/hda/patch_realtek.c | 43 ++- + 14 files changed, 431 insertions(+), 226 deletions(-) + delete mode 100644 drivers/platform/x86/i2c-multi-instantiate.c + create mode 100644 drivers/platform/x86/serial-multi-instantiate.c +Merging chrome-platform/for-next (ffebd9053272 platform/chrome: cros_ec_typec: Check for EC device) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 5 +++++ + drivers/platform/chrome/cros_ec_typec.c | 21 ++++++++++++++------- + 2 files changed, 19 insertions(+), 7 deletions(-) +Merging hsi/for-next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +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 +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/Makefile +Merge made by the 'ort' strategy. +Merging ipmi/for-next (d134ad2574a1 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 'ort' 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 (27446562a1d9 platform: use dev_err_probe() in platform_get_irq_byname()) +$ 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 drivers/base/devtmpfs.c +Auto-merging net/sunrpc/sysfs.c +Merge made by the 'ort' strategy. + drivers/base/component.c | 242 ++++++++++++++++----------------- + drivers/base/devtmpfs.c | 2 - + drivers/base/platform.c | 6 +- + drivers/md/bcache/stats.c | 3 +- + drivers/md/bcache/sysfs.c | 15 +- + drivers/md/bcache/sysfs.h | 2 +- + drivers/power/supply/ab8500_chargalg.c | 5 +- + drivers/power/supply/ab8500_fg.c | 3 +- + fs/ubifs/sysfs.c | 3 +- + include/linux/component.h | 18 +-- + include/linux/firmware.h | 2 +- + scripts/get_abi.pl | 1 + + scripts/spdxcheck.py | 2 +- + 13 files changed, 154 insertions(+), 150 deletions(-) +Merging usb/usb-next (c3c9cee59282 usb: ehci: add pci device support for Aspeed platforms) +$ 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 arch/arm64/boot/dts/qcom/ipq6018.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/ipq6018.dtsi +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/gadget/function/f_uac2.c +Recorded preimage for 'arch/arm64/boot/dts/qcom/ipq6018.dtsi' +Recorded preimage for 'arch/arm64/boot/dts/xilinx/zynqmp.dtsi' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/arm64/boot/dts/qcom/ipq6018.dtsi'. +Recorded resolution for 'arch/arm64/boot/dts/xilinx/zynqmp.dtsi'. +[master 7d470a2967ed] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-usb-gadget-uac1 | 5 +- + Documentation/ABI/testing/configfs-usb-gadget-uac2 | 7 +- + .../bindings/usb/microchip,mpfs-musb.yaml | 59 +++ + .../devicetree/bindings/usb/snps,dwc3.yaml | 7 +- + Documentation/usb/gadget-testing.rst | 12 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 3 +- + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 +- + drivers/usb/cdns3/cdnsp-debug.h | 305 ++++++------- + drivers/usb/cdns3/cdnsp-gadget.c | 3 - + drivers/usb/chipidea/udc.c | 2 +- + drivers/usb/core/hcd-pci.c | 2 +- + drivers/usb/core/hub.c | 8 +- + drivers/usb/core/usb-acpi.c | 2 +- + drivers/usb/dwc3/core.c | 117 ++++- + drivers/usb/dwc3/core.h | 13 +- + drivers/usb/dwc3/drd.c | 13 + + drivers/usb/gadget/function/f_fs.c | 4 +- + drivers/usb/gadget/function/f_mass_storage.c | 70 ++- + drivers/usb/gadget/function/f_phonet.c | 4 +- + drivers/usb/gadget/function/f_serial.c | 4 + + drivers/usb/gadget/function/f_uac1.c | 236 ++++++++-- + drivers/usb/gadget/function/f_uac2.c | 476 +++++++++++++++------ + drivers/usb/gadget/function/u_audio.c | 238 ++++++++++- + drivers/usb/gadget/function/u_audio.h | 14 +- + drivers/usb/gadget/function/u_uac1.h | 7 +- + drivers/usb/gadget/function/u_uac2.h | 11 +- + drivers/usb/gadget/function/uac_common.h | 9 + + drivers/usb/gadget/legacy/audio.c | 93 ++-- + drivers/usb/gadget/udc/tegra-xudc.c | 20 +- + drivers/usb/host/ehci-pci.c | 9 + + drivers/usb/host/ehci-sched.c | 4 +- + drivers/usb/host/fotg210-hcd.c | 4 +- + drivers/usb/host/xhci-mtk-sch.c | 7 +- + drivers/usb/host/xhci-plat.c | 13 +- + 35 files changed, 1344 insertions(+), 445 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml + create mode 100644 drivers/usb/gadget/function/uac_common.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 (26291c54e111 Linux 5.17-rc2) +$ 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 +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'ort' strategy. +Merging tty/tty-next (fcc446c8aa63 serial: 8250_bcm2835aux: Add ACPI support) +$ 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 drivers/tty/serial/max3100.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/fsl-lpuart.yaml | 4 +- + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + .../devicetree/bindings/serial/renesas,sci.yaml | 2 + + .../devicetree/bindings/serial/renesas,scif.yaml | 5 +- + .../devicetree/bindings/serial/samsung_uart.yaml | 2 + + drivers/tty/amiserial.c | 6 +- + drivers/tty/mxser.c | 109 +++++++++------------ + drivers/tty/serdev/core.c | 7 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 52 ++++++++-- + drivers/tty/serial/8250/8250_exar.c | 37 +++---- + drivers/tty/serial/atmel_serial.c | 1 + + drivers/tty/serial/fsl_linflexuart.c | 46 ++++----- + drivers/tty/serial/fsl_lpuart.c | 20 ++-- + drivers/tty/serial/imx.c | 2 +- + drivers/tty/serial/max3100.c | 1 - + drivers/tty/serial/mcf.c | 7 +- + drivers/tty/serial/serial_core.c | 24 ++--- + drivers/tty/serial/serial_mctrl_gpio.c | 38 +++++++ + drivers/tty/serial/serial_mctrl_gpio.h | 18 ++++ + drivers/tty/serial/stm32-usart.c | 3 +- + drivers/tty/tty_port.c | 18 ++-- + include/linux/serial_core.h | 2 +- + include/linux/tty_port.h | 3 + + 23 files changed, 235 insertions(+), 173 deletions(-) +Merging char-misc/char-misc-next (463713eb6164 VMCI: dma dg: add support for DMA datagrams receive) +$ 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 +Merge made by the 'ort' strategy. + .../bindings/reserved-memory/google,open-dice.yaml | 46 +++ + Documentation/driver-api/driver-model/devres.rst | 1 + + drivers/accessibility/speakup/speakup_audptr.c | 24 +- + drivers/accessibility/speakup/synth.c | 2 +- + drivers/android/binder_alloc.c | 8 +- + drivers/char/hpet.c | 28 +- + drivers/comedi/drivers/das16.c | 4 +- + drivers/comedi/drivers/pcm3724.c | 1 - + drivers/dio/dio.c | 140 +++++---- + drivers/fsi/fsi-master-aspeed.c | 17 +- + drivers/greybus/svc.c | 16 +- + drivers/misc/Kconfig | 12 + + drivers/misc/Makefile | 1 + + drivers/misc/cardreader/alcor_pci.c | 9 +- + drivers/misc/cardreader/rtl8411.c | 2 +- + drivers/misc/cardreader/rts5209.c | 2 +- + drivers/misc/cardreader/rts5228.c | 2 +- + drivers/misc/cardreader/rts5229.c | 2 +- + drivers/misc/cardreader/rts5249.c | 31 +- + drivers/misc/cardreader/rts5261.c | 2 +- + drivers/misc/cardreader/rtsx_pcr.c | 164 ++++------ + drivers/misc/cardreader/rtsx_pcr.h | 1 + + drivers/misc/eeprom/at25.c | 4 +- + drivers/misc/mei/pci-me.c | 10 +- + drivers/misc/open-dice.c | 208 +++++++++++++ + drivers/misc/vmw_vmci/vmci_guest.c | 335 +++++++++++++++++---- + drivers/mmc/host/rtsx_pci_sdmmc.c | 44 ++- + drivers/mux/core.c | 239 +++++++++++++-- + drivers/of/platform.c | 1 + + drivers/pps/clients/pps-gpio.c | 2 +- + include/linux/mux/consumer.h | 18 ++ + include/linux/rtsx_pci.h | 5 +- + include/linux/vmw_vmci_defs.h | 84 +++++- + tools/testing/selftests/lkdtm/config | 2 +- + 34 files changed, 1112 insertions(+), 355 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reserved-memory/google,open-dice.yaml + create mode 100644 drivers/misc/open-dice.c +Merging extcon/extcon-next (26291c54e111 Linux 5.17-rc2) +$ 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 gnss/gnss-next (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging phy-next/next (1e805d190ba5 Merge tag 'phy-fixes-5.17' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +CONFLICT (modify/delete): Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt deleted in phy-next/next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt +rm 'Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt' +$ git commit --no-edit -v -a +[master 169c27da406d] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/phy/mediatek,tphy.yaml | 1 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../devicetree/bindings/phy/qcom,usb-hs-phy.txt | 85 ---------------- + .../devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 108 +++++++++++++++++++++ + drivers/phy/amlogic/phy-meson-gxl-usb2.c | 5 +- + drivers/phy/amlogic/phy-meson8b-usb2.c | 9 +- + drivers/phy/freescale/Kconfig | 5 + + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 3 +- + drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 28 +++--- + drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 + + 10 files changed, 142 insertions(+), 106 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml +$ git am -3 ../patches/0001-merge-fix-for-dt-bindings-phy-qcom-usb-hs-phy-add-MS.patch +Applying: merge fix for "dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml +$ git add -A . +$ git commit -v -a --amend +[master 9814d8f5df47] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git + Date: Thu Feb 10 14:22:59 2022 +1100 +Merging soundwire/next (e783362eb54c Linux 5.17-rc1) +$ 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 (7f7b571becf3 thunderbolt: Replace acpi_bus_get_device()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/acpi.c | 4 +- + drivers/thunderbolt/lc.c | 110 ++++++++++++++++++++++++++++++++++++++++++ + drivers/thunderbolt/nhi.c | 3 +- + drivers/thunderbolt/switch.c | 71 ++++++++++++++++++++++++++- + drivers/thunderbolt/tb.c | 11 +++++ + drivers/thunderbolt/tb.h | 8 +++ + drivers/thunderbolt/tb_regs.h | 9 ++++ + drivers/thunderbolt/tunnel.c | 10 ++++ + 8 files changed, 221 insertions(+), 5 deletions(-) +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 +Already up to date. +Merging staging/staging-next (f2c461536226 staging: drop fpgaboot driver) +$ 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/fbtft/fbtft.h +CONFLICT (content): Merge conflict in drivers/staging/fbtft/fbtft.h +Auto-merging drivers/staging/pi433/pi433_if.c +Auto-merging drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +Auto-merging drivers/staging/wfx/bus_spi.c +Recorded preimage for 'drivers/staging/fbtft/fbtft.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/staging/fbtft/fbtft.h'. +[master d5b7a508f0e2] Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git +$ git diff -M --stat --summary HEAD^.. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/gdm724x/hci_packet.h | 2 +- + drivers/staging/gs_fpgaboot/Kconfig | 8 - + drivers/staging/gs_fpgaboot/Makefile | 3 - + drivers/staging/gs_fpgaboot/README | 70 --- + drivers/staging/gs_fpgaboot/TODO | 7 - + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 394 ----------------- + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 41 -- + drivers/staging/gs_fpgaboot/io.c | 105 ----- + drivers/staging/gs_fpgaboot/io.h | 73 ---- + drivers/staging/mt7621-dts/gbpc2.dts | 16 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 53 ++- + drivers/staging/nvec/nvec.c | 4 +- + drivers/staging/pi433/TODO | 3 +- + drivers/staging/pi433/pi433_if.c | 168 +++++-- + drivers/staging/pi433/rf69.c | 123 ++---- + drivers/staging/pi433/rf69.h | 2 + + drivers/staging/pi433/rf69_registers.h | 2 + + drivers/staging/r8188eu/Makefile | 1 + + drivers/staging/r8188eu/core/rtw_ap.c | 151 +++---- + drivers/staging/r8188eu/core/rtw_cmd.c | 37 +- + drivers/staging/r8188eu/core/rtw_fw.c | 329 ++++++++++++++ + drivers/staging/r8188eu/core/rtw_ieee80211.c | 36 +- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 10 +- + drivers/staging/r8188eu/core/rtw_iol.c | 10 +- + drivers/staging/r8188eu/core/rtw_mlme.c | 117 ++--- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 483 +++++++++++---------- + drivers/staging/r8188eu/core/rtw_p2p.c | 4 +- + drivers/staging/r8188eu/core/rtw_recv.c | 13 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 4 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 24 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 51 +-- + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 135 +----- + drivers/staging/r8188eu/hal/hal_com.c | 36 +- + drivers/staging/r8188eu/hal/odm.c | 22 - + drivers/staging/r8188eu/hal/odm_HWConfig.c | 34 +- + drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 7 +- + drivers/staging/r8188eu/hal/rtl8188e_dm.c | 35 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 306 +------------ + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 64 +-- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 24 +- + drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 4 +- + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 11 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 330 ++------------ + drivers/staging/r8188eu/hal/usb_ops_linux.c | 14 +- + drivers/staging/r8188eu/include/HalVerDef.h | 23 - + drivers/staging/r8188eu/include/drv_types.h | 44 +- + drivers/staging/r8188eu/include/hal_com.h | 3 - + drivers/staging/r8188eu/include/hal_intf.h | 29 +- + drivers/staging/r8188eu/include/odm.h | 15 +- + drivers/staging/r8188eu/include/odm_HWConfig.h | 39 +- + drivers/staging/r8188eu/include/osdep_service.h | 50 +-- + drivers/staging/r8188eu/include/recv_osdep.h | 5 - + drivers/staging/r8188eu/include/rtl8188e_dm.h | 3 +- + drivers/staging/r8188eu/include/rtl8188e_hal.h | 94 +--- + drivers/staging/r8188eu/include/rtl8188e_spec.h | 2 +- + drivers/staging/r8188eu/include/rtl8188e_xmit.h | 2 + + drivers/staging/r8188eu/include/rtw_cmd.h | 2 +- + drivers/staging/r8188eu/include/rtw_fw.h | 12 + + drivers/staging/r8188eu/include/rtw_mlme.h | 5 - + drivers/staging/r8188eu/include/rtw_recv.h | 9 - + drivers/staging/r8188eu/include/wifi.h | 7 +- + drivers/staging/r8188eu/include/wlan_bssdef.h | 2 +- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 160 +++---- + drivers/staging/r8188eu/os_dep/os_intfs.c | 12 +- + drivers/staging/r8188eu/os_dep/osdep_service.c | 2 - + drivers/staging/r8188eu/os_dep/recv_linux.c | 26 -- + drivers/staging/r8188eu/os_dep/usb_intf.c | 24 +- + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 24 +- + drivers/staging/r8188eu/os_dep/xmit_linux.c | 6 +- + drivers/staging/rtl8712/rtl871x_recv.c | 4 +- + drivers/staging/rtl8712/rtl871x_recv.h | 8 - + drivers/staging/rtl8723bs/core/rtw_cmd.c | 54 ++- + drivers/staging/rtl8723bs/core/rtw_recv.c | 11 +- + drivers/staging/rtl8723bs/hal/hal_intf.c | 5 + + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 3 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 11 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 98 ++--- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 6 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 2 +- + drivers/staging/unisys/visorinput/visorinput.c | 3 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 10 +- + drivers/staging/vc04_services/interface/TODO | 56 +-- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 34 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 137 +++--- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 2 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 7 +- + drivers/staging/vt6656/usbpipe.c | 4 +- + .../bindings/net/wireless/silabs,wfx.yaml | 23 +- + drivers/staging/wfx/Kconfig | 5 + + drivers/staging/wfx/Makefile | 3 +- + drivers/staging/wfx/bh.c | 67 ++- + drivers/staging/wfx/bh.h | 1 + + drivers/staging/wfx/bus.h | 8 +- + drivers/staging/wfx/bus_sdio.c | 97 +++-- + drivers/staging/wfx/bus_spi.c | 98 +++-- + drivers/staging/wfx/data_rx.c | 10 +- + drivers/staging/wfx/data_rx.h | 5 +- + drivers/staging/wfx/data_tx.c | 144 +++--- + drivers/staging/wfx/data_tx.h | 20 +- + drivers/staging/wfx/debug.c | 80 +--- + drivers/staging/wfx/debug.h | 6 +- + drivers/staging/wfx/fwio.c | 113 +++-- + drivers/staging/wfx/hif_api_cmd.h | 150 +++---- + drivers/staging/wfx/hif_api_general.h | 64 ++- + drivers/staging/wfx/hif_api_mib.h | 68 +-- + drivers/staging/wfx/hif_rx.c | 168 +++---- + drivers/staging/wfx/hif_tx.c | 194 ++++----- + drivers/staging/wfx/hif_tx.h | 67 +-- + drivers/staging/wfx/hif_tx_mib.c | 202 ++++----- + drivers/staging/wfx/hif_tx_mib.h | 67 ++- + drivers/staging/wfx/hwio.c | 171 ++++---- + drivers/staging/wfx/hwio.h | 35 +- + drivers/staging/wfx/key.c | 84 ++-- + drivers/staging/wfx/key.h | 5 +- + drivers/staging/wfx/main.c | 183 ++++---- + drivers/staging/wfx/main.h | 12 +- + drivers/staging/wfx/queue.c | 51 +-- + drivers/staging/wfx/queue.h | 13 +- + drivers/staging/wfx/scan.c | 27 +- + drivers/staging/wfx/sta.c | 194 ++++----- + drivers/staging/wfx/sta.h | 22 +- + drivers/staging/wfx/traces.h | 33 +- + drivers/staging/wfx/wfx.h | 102 +++-- + include/dt-bindings/reset/mt7621-reset.h | 37 ++ + 127 files changed, 2655 insertions(+), 4402 deletions(-) + delete mode 100644 drivers/staging/gs_fpgaboot/Kconfig + delete mode 100644 drivers/staging/gs_fpgaboot/Makefile + delete mode 100644 drivers/staging/gs_fpgaboot/README + delete mode 100644 drivers/staging/gs_fpgaboot/TODO + delete mode 100644 drivers/staging/gs_fpgaboot/gs_fpgaboot.c + delete mode 100644 drivers/staging/gs_fpgaboot/gs_fpgaboot.h + delete mode 100644 drivers/staging/gs_fpgaboot/io.c + delete mode 100644 drivers/staging/gs_fpgaboot/io.h + create mode 100644 drivers/staging/r8188eu/core/rtw_fw.c + create mode 100644 drivers/staging/r8188eu/include/rtw_fw.h + create mode 100644 include/dt-bindings/reset/mt7621-reset.h +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 (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging icc/icc-next (9d6c7ee7c4bb interconnect: imx: Add imx_icc_get_bw function to set initial avg and peak) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + drivers/interconnect/imx/imx.c | 9 +++++++++ + 1 file changed, 9 insertions(+) +Merging dmaengine/next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (48da2ddc4c78 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/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. +Merging scsi/for-next (c8312098022b 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/scsi_debug.c +Merge made by the 'ort' strategy. + drivers/scsi/bfa/bfad_attr.c | 26 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 7 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 1 - + drivers/scsi/mvsas/mv_init.c | 4 +- + drivers/scsi/qedi/qedi_main.c | 2 - + drivers/scsi/qla2xxx/qla_attr.c | 7 +- + drivers/scsi/qla2xxx/qla_bsg.c | 6 +- + drivers/scsi/qla2xxx/qla_def.h | 17 +- + drivers/scsi/qla2xxx/qla_edif.c | 25 +- + drivers/scsi/qla2xxx/qla_gbl.h | 5 +- + drivers/scsi/qla2xxx/qla_gs.c | 155 ++++++------ + drivers/scsi/qla2xxx/qla_init.c | 199 +++++++++------- + drivers/scsi/qla2xxx/qla_inline.h | 2 + + drivers/scsi/qla2xxx/qla_iocb.c | 70 ++++-- + drivers/scsi/qla2xxx/qla_mbx.c | 37 ++- + drivers/scsi/qla2xxx/qla_mid.c | 9 +- + drivers/scsi/qla2xxx/qla_mr.c | 11 +- + drivers/scsi/qla2xxx/qla_nvme.c | 16 +- + drivers/scsi/qla2xxx/qla_nvme.h | 4 + + drivers/scsi/qla2xxx/qla_os.c | 40 +++- + drivers/scsi/qla2xxx/qla_sup.c | 4 +- + drivers/scsi/qla2xxx/qla_target.c | 14 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 9 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/scsi_debug.c | 474 ++++++++++++++++++++++++++----------- + drivers/scsi/ufs/ufs.h | 6 + + drivers/scsi/ufs/ufshcd.c | 52 ++++ + 28 files changed, 799 insertions(+), 409 deletions(-) +Merging scsi-mkp/for-next (62ed6622aaf0 scsi: smartpqi: Update version to 2.1.14-035) +$ 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/scsi_lib.c +Merge made by the 'ort' strategy. + drivers/scsi/scsi_lib.c | 21 +- + drivers/scsi/scsi_sysfs.c | 8 - + drivers/scsi/smartpqi/smartpqi.h | 16 +- + drivers/scsi/smartpqi/smartpqi_init.c | 541 +++++++++++++++++++++++++--------- + drivers/scsi/smartpqi/smartpqi_sis.c | 10 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 1 + + drivers/usb/storage/usb.c | 2 +- + include/scsi/scsi_cmnd.h | 1 + + 8 files changed, 435 insertions(+), 165 deletions(-) +Merging vhost/linux-next (fae0bd40fab0 virtio_console: break out of buf poll on remove) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Merge made by the 'ort' strategy. + drivers/char/virtio_console.c | 7 ++++++ + drivers/virtio/virtio.c | 56 +++++++++++++++++++++++++++++-------------- + include/linux/virtio.h | 1 - + include/linux/virtio_config.h | 3 ++- + 4 files changed, 47 insertions(+), 20 deletions(-) +Merging rpmsg/for-next (f5d4b6d998d4 Merge branches 'rpmsg-next' and 'rproc-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 +Merge made by the 'ort' strategy. + drivers/remoteproc/mtk_scp.c | 55 +++++++++++++-------------------- + drivers/remoteproc/remoteproc_debugfs.c | 2 +- + 2 files changed, 22 insertions(+), 35 deletions(-) +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 (4398693a9e24 gpiolib: make struct comments into real kernel docs) +$ 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 drivers/gpio/gpiolib-sysfs.c +Auto-merging drivers/gpio/gpiolib.h +Merge made by the 'ort' strategy. + .../bindings/gpio/airoha,en7523-gpio.yaml | 66 ++++++++++ + .../devicetree/bindings/gpio/faraday,ftgpio010.txt | 27 ---- + .../bindings/gpio/faraday,ftgpio010.yaml | 65 ++++++++++ + .../devicetree/bindings/gpio/gpio-vf610.yaml | 4 +- + Documentation/devicetree/bindings/gpio/gpio.txt | 2 +- + drivers/gpio/Kconfig | 10 ++ + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-en7523.c | 137 +++++++++++++++++++++ + drivers/gpio/gpiolib-of.c | 10 +- + drivers/gpio/gpiolib-sysfs.c | 7 +- + drivers/gpio/gpiolib.c | 35 +++--- + drivers/gpio/gpiolib.h | 41 ++++++ + include/linux/gpio/consumer.h | 35 +++--- + 13 files changed, 362 insertions(+), 78 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/airoha,en7523-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/faraday,ftgpio010.txt + create mode 100644 Documentation/devicetree/bindings/gpio/faraday,ftgpio010.yaml + create mode 100644 drivers/gpio/gpio-en7523.c +Merging gpio-intel/for-next (a1ce76e89907 gpio: tps68470: Allow building as module) +$ 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 +Auto-merging drivers/gpio/Kconfig +Merge made by the 'ort' strategy. + drivers/gpio/Kconfig | 6 +----- + drivers/gpio/gpio-altera-a10sr.c | 3 ++- + drivers/gpio/gpio-crystalcove.c | 9 ++++++++- + drivers/gpio/gpio-merrifield.c | 3 +++ + drivers/gpio/gpio-tegra.c | 1 - + drivers/gpio/gpio-tps68470.c | 5 ++++- + 6 files changed, 18 insertions(+), 9 deletions(-) +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 (003c30d8ad1c 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 MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/pinctrl/brcm,bcm4908-pinctrl.yaml | 72 ++ + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 1 + + .../bindings/pinctrl/qcom,tlmm-common.yaml | 1 - + .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 374 ++++++ + MAINTAINERS | 18 + + drivers/pinctrl/Kconfig | 1 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/bcm/Kconfig | 14 + + drivers/pinctrl/bcm/Makefile | 1 + + drivers/pinctrl/bcm/pinctrl-bcm4908.c | 563 +++++++++ + drivers/pinctrl/meson/Kconfig | 6 + + drivers/pinctrl/meson/Makefile | 1 + + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 6 +- + drivers/pinctrl/meson/pinctrl-meson-s4.c | 1232 ++++++++++++++++++++ + drivers/pinctrl/pinctrl-at91-pio4.c | 16 +- + drivers/pinctrl/pxa/pinctrl-pxa27x.c | 5 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 4 +- + drivers/pinctrl/sunplus/Kconfig | 22 + + drivers/pinctrl/sunplus/Makefile | 6 + + drivers/pinctrl/sunplus/sppctl.c | 1118 ++++++++++++++++++ + drivers/pinctrl/sunplus/sppctl.h | 170 +++ + drivers/pinctrl/sunplus/sppctl_sp7021.c | 583 +++++++++ + include/dt-bindings/gpio/meson-s4-gpio.h | 99 ++ + include/dt-bindings/pinctrl/sppctl-sp7021.h | 179 +++ + include/dt-bindings/pinctrl/sppctl.h | 31 + + 25 files changed, 4508 insertions(+), 16 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/sunplus,sp7021-pinctrl.yaml + create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm4908.c + create mode 100644 drivers/pinctrl/meson/pinctrl-meson-s4.c + create mode 100644 drivers/pinctrl/sunplus/Kconfig + create mode 100644 drivers/pinctrl/sunplus/Makefile + create mode 100644 drivers/pinctrl/sunplus/sppctl.c + create mode 100644 drivers/pinctrl/sunplus/sppctl.h + create mode 100644 drivers/pinctrl/sunplus/sppctl_sp7021.c + create mode 100644 include/dt-bindings/gpio/meson-s4-gpio.h + create mode 100644 include/dt-bindings/pinctrl/sppctl-sp7021.h + create mode 100644 include/dt-bindings/pinctrl/sppctl.h +Merging pinctrl-intel/for-next (689e00887740 pinctrl: baytrail: Clear direct_irq_en flag on broken configs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 55 ++++++++++++++++++++++++++++++-- + 1 file changed, 53 insertions(+), 2 deletions(-) +Merging pinctrl-renesas/renesas-pinctrl (2e08ab0427fe pinctrl: renesas: rzg2l: Improve rzg2l_gpio_register()) +$ 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 +Merge made by the 'ort' strategy. + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 16 +++- + drivers/pinctrl/renesas/Kconfig | 6 +- + drivers/pinctrl/renesas/pfc-r8a7779.c | 8 +- + drivers/pinctrl/renesas/pfc-r8a7790.c | 45 ++++------ + drivers/pinctrl/renesas/pfc-r8a7791.c | 35 ++++---- + drivers/pinctrl/renesas/pfc-r8a77990.c | 22 ++++- + drivers/pinctrl/renesas/pfc-r8a77995.c | 100 ++++++++++++--------- + drivers/pinctrl/renesas/pfc-r8a779a0.c | 42 ++++----- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 4 +- + drivers/pinctrl/renesas/pinctrl.c | 2 +- + 10 files changed, 155 insertions(+), 125 deletions(-) +Merging pinctrl-samsung/for-next (3652dc070bad pinctrl: samsung: improve wake irq info on console) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Merge made by the 'ort' strategy. + .../bindings/pinctrl/samsung,pinctrl.yaml | 1 + + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 71 ++++++++++++++++++++++ + drivers/pinctrl/samsung/pinctrl-exynos.c | 3 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + 5 files changed, 77 insertions(+), 1 deletion(-) +Merging pwm/for-next (657e54e54ba5 pwm: pxa: Implement .apply() callback) +$ 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 +Merge made by the 'ort' strategy. + drivers/pwm/pwm-img.c | 141 +++++++++++++++++++++--------------------- + drivers/pwm/pwm-imx1.c | 33 ++++++++-- + drivers/pwm/pwm-lpc18xx-sct.c | 49 +++++---------- + drivers/pwm/pwm-meson.c | 25 +++----- + drivers/pwm/pwm-pxa.c | 33 ++++++++-- + drivers/pwm/pwm-stmpe.c | 18 +++--- + drivers/pwm/pwm-sun4i.c | 70 ++++++++++----------- + drivers/pwm/pwm-tegra.c | 59 +++++++++--------- + 8 files changed, 223 insertions(+), 205 deletions(-) +Merging userns/for-next (f9d87929d451 ucount: Make get_ucount a safe get_user replacement) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Already up to date. +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 (6d468898d774 selftests: futex: set DEFAULT_INSTALL_HDR_PATH) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'ort' strategy. + tools/testing/selftests/futex/functional/Makefile | 1 + + tools/testing/selftests/kselftest/runner.sh | 30 ++++++++++++++++++++++- + 2 files changed, 30 insertions(+), 1 deletion(-) +Merging livepatching/for-next (32fdbc45ade0 Merge branch 'for-5.17/kallsyms' 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 'ort' strategy. +Merging coresight/next (a4dabc3d30ea coresight: etm4x: Add lock for reading virtual context ID comparator) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Auto-merging arch/arm64/Kconfig +Merge made by the 'ort' strategy. + arch/arm64/Kconfig | 6 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 2 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 10 +- + drivers/hwtracing/coresight/coresight-platform.c | 8 +- + drivers/hwtracing/coresight/coresight-syscfg.c | 2 +- + drivers/hwtracing/coresight/coresight-trbe.c | 125 +++++++++++++++------ + drivers/hwtracing/coresight/coresight-trbe.h | 8 -- + 7 files changed, 109 insertions(+), 52 deletions(-) +Merging rtc/rtc-next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +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 +Already up to date. +Merging at24/at24/for-next (e783362eb54c Linux 5.17-rc1) +$ 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 +Already up to date. +Merging ntb/ntb-next (afe1c85b354c IDT: Fix Build warnings on some 32bit architectures.) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 8 ++++---- + drivers/ntb/hw/idt/Makefile | 1 + + drivers/ntb/hw/intel/ntb_hw_gen4.c | 17 ++++++++++++++++- + drivers/ntb/hw/intel/ntb_hw_gen4.h | 16 ++++++++++++++++ + drivers/ntb/msi.c | 6 ++---- + 5 files changed, 39 insertions(+), 9 deletions(-) +Merging seccomp/for-next/seccomp (6cac51cea416 samples/seccomp: Adjust sample to also provide kill option) +$ 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 +Merge made by the 'ort' strategy. + kernel/seccomp.c | 10 ++++++++++ + kernel/signal.c | 5 +++-- + samples/seccomp/dropper.c | 9 +++++++-- + 3 files changed, 20 insertions(+), 4 deletions(-) +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 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 (e783362eb54c Linux 5.17-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 (8043480a8cef nvmem: qfprom: fix kerneldoc warning) +$ 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 'ort' strategy. + drivers/nvmem/core.c | 47 ++++++++++-------------------------------- + drivers/nvmem/qfprom.c | 2 +- + include/linux/nvmem-provider.h | 8 ------- + 3 files changed, 12 insertions(+), 45 deletions(-) +Merging xarray/main (22f56b8e890d XArray: Include bitmap.h from xarray.h) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Merge made by the 'ort' strategy. + Documentation/core-api/xarray.rst | 14 +++++++++----- + include/linux/xarray.h | 1 + + 2 files changed, 10 insertions(+), 5 deletions(-) +Merging hyperv/hyperv-next (4ee524587105 Drivers: hv: Compare cpumasks and not their weights in init_vp_index()) +$ 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/hv/vmbus_drv.c +Merge made by the 'ort' strategy. + drivers/hv/channel_mgmt.c | 19 +++++++++---------- + drivers/hv/hyperv_vmbus.h | 14 +++++++------- + drivers/hv/vmbus_drv.c | 4 ++-- + 3 files changed, 18 insertions(+), 19 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 (21f0a239ecab fpga: dfl: pci: Remove usage of the deprecated "pci-dma-compat.h" API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + drivers/fpga/dfl-pci.c | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) +Merging kunit/test (e783362eb54c Linux 5.17-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 (c2741453478b kunit: cleanup assertion macro internal variables) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + include/kunit/assert.h | 220 ++++-------- + include/kunit/test.h | 745 +++++++++++------------------------------ + lib/kunit/assert.c | 80 ++--- + lib/kunit/kunit-example-test.c | 42 +++ + lib/kunit/test.c | 35 +- + tools/testing/kunit/kunit.py | 24 +- + 6 files changed, 359 insertions(+), 787 deletions(-) +Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ 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 (b2aa7904752d bus: mhi: pci_generic: Add mru_default for Cinterion MV31-W) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. +Merging memblock/for-next (5b3408a4e5ff memblock tests: Add memblock_free tests) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + tools/include/linux/atomic.h | 2 + + tools/include/linux/cache.h | 10 + + tools/include/linux/debugfs.h | 5 + + tools/include/linux/gfp.h | 28 + + tools/include/linux/io.h | 5 + + tools/include/linux/kernel.h | 6 + + tools/include/linux/mm.h | 42 + + tools/include/linux/pfn.h | 10 + + tools/{testing/radix-tree => include}/linux/slab.h | 25 +- + tools/include/linux/types.h | 10 + + tools/lib/slab.c | 38 + + tools/testing/memblock/.gitignore | 4 + + tools/testing/memblock/Makefile | 54 ++ + tools/testing/memblock/asm/dma.h | 5 + + tools/testing/memblock/internal.h | 12 + + tools/testing/memblock/lib/slab.c | 9 + + tools/testing/memblock/linux/init.h | 34 + + tools/testing/memblock/linux/kernel.h | 12 + + tools/testing/memblock/linux/kmemleak.h | 18 + + tools/testing/memblock/linux/memory_hotplug.h | 19 + + tools/testing/memblock/linux/mmzone.h | 35 + + tools/testing/memblock/linux/printk.h | 25 + + tools/testing/memblock/main.c | 8 + + tools/testing/memblock/mmzone.c | 20 + + tools/testing/memblock/scripts/Makefile.include | 17 + + tools/testing/memblock/tests/basic_api.c | 896 +++++++++++++++++++++ + tools/testing/memblock/tests/basic_api.h | 10 + + tools/testing/memblock/tests/common.c | 27 + + tools/testing/memblock/tests/common.h | 15 + + tools/testing/radix-tree/Makefile | 3 +- + tools/testing/radix-tree/linux.c | 27 - + tools/testing/radix-tree/linux/gfp.h | 33 - + 33 files changed, 1397 insertions(+), 68 deletions(-) + create mode 100644 tools/include/linux/cache.h + create mode 100644 tools/include/linux/debugfs.h + create mode 100644 tools/include/linux/io.h + create mode 100644 tools/include/linux/mm.h + create mode 100644 tools/include/linux/pfn.h + rename tools/{testing/radix-tree => include}/linux/slab.h (61%) + create mode 100644 tools/lib/slab.c + create mode 100644 tools/testing/memblock/.gitignore + create mode 100644 tools/testing/memblock/Makefile + create mode 100644 tools/testing/memblock/asm/dma.h + create mode 100644 tools/testing/memblock/internal.h + create mode 100644 tools/testing/memblock/lib/slab.c + create mode 100644 tools/testing/memblock/linux/init.h + create mode 100644 tools/testing/memblock/linux/kernel.h + create mode 100644 tools/testing/memblock/linux/kmemleak.h + create mode 100644 tools/testing/memblock/linux/memory_hotplug.h + create mode 100644 tools/testing/memblock/linux/mmzone.h + create mode 100644 tools/testing/memblock/linux/printk.h + create mode 100644 tools/testing/memblock/main.c + create mode 100644 tools/testing/memblock/mmzone.c + create mode 100644 tools/testing/memblock/scripts/Makefile.include + create mode 100644 tools/testing/memblock/tests/basic_api.c + create mode 100644 tools/testing/memblock/tests/basic_api.h + create mode 100644 tools/testing/memblock/tests/common.c + create mode 100644 tools/testing/memblock/tests/common.h + delete mode 100644 tools/testing/radix-tree/linux/gfp.h +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 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 +Already up to date. +Merging folio/for-next (b1ccdc7664f5 selftests/vm/transhuge-stress: Support file-backed PMD folios) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Merge made by the 'ort' strategy. + Documentation/core-api/pin_user_pages.rst | 18 +- + arch/hexagon/include/asm/pgtable.h | 3 +- + arch/powerpc/include/asm/mmu_context.h | 1 - + include/linux/huge_mm.h | 59 +--- + include/linux/hugetlb.h | 5 + + include/linux/ksm.h | 6 +- + include/linux/mm.h | 231 ++++++++------ + include/linux/mm_types.h | 7 +- + include/linux/pagemap.h | 32 +- + include/linux/rmap.h | 50 +++- + include/linux/swap.h | 6 +- + include/trace/events/vmscan.h | 10 +- + kernel/events/uprobes.c | 2 +- + mm/damon/paddr.c | 52 ++-- + mm/debug.c | 18 +- + mm/filemap.c | 59 ++-- + mm/folio-compat.c | 34 +++ + mm/gup.c | 383 ++++++++++-------------- + mm/huge_memory.c | 127 ++++---- + mm/hugetlb.c | 11 +- + mm/internal.h | 52 ++-- + mm/ksm.c | 17 +- + mm/memcontrol.c | 22 +- + mm/memory-failure.c | 10 +- + mm/memory_hotplug.c | 13 +- + mm/migrate.c | 90 +++--- + mm/mlock.c | 136 +++++---- + mm/page_alloc.c | 3 +- + mm/page_idle.c | 26 +- + mm/page_vma_mapped.c | 58 ++-- + mm/readahead.c | 108 ++++++- + mm/rmap.c | 416 +++++++++++++------------- + mm/util.c | 36 ++- + mm/vmscan.c | 280 ++++++++--------- + mm/workingset.c | 25 +- + tools/testing/selftests/vm/transhuge-stress.c | 35 ++- + 36 files changed, 1317 insertions(+), 1124 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 9013b6cd0dc8 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git +Merging next-20220204 version of folio +$ git merge -m next-20220204/folio 3abb28e275bfbe60136db37eae6679c3e1928cd5 +Already up to date. +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 +Already up to date. +Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (42f4046bc4ba efi: use default_groups in kobj_type) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (5298d4bfe80f unicode: clean up the Kconfig symbol confusion) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Already up to date. +Merging slab/for-next (07f910f9b729 mm: Remove slab from struct page) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Already up to date. +Merging random/master (a5a34bba133c random: tie batched entropy generation to base_crng generation) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging drivers/char/random.c +Merge made by the 'ort' strategy. + drivers/char/random.c | 1363 ++++++++++++++--------------------------- + include/linux/hw_random.h | 2 +- + include/linux/random.h | 10 +- + include/trace/events/random.h | 109 ++-- + 4 files changed, 505 insertions(+), 979 deletions(-) +Merging landlock/next (a691b9858300 Merge Landlock fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging kernel/sysctl.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/fs.rst | 50 +++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/open.c | 133 ++++++++ + fs/proc/proc_sysctl.c | 2 +- + include/linux/syscalls.h | 1 + + include/linux/sysctl.h | 3 + + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/trusted-for.h | 18 + + kernel/printk/sysctl.c | 9 - + kernel/sysctl.c | 9 + + samples/landlock/sandboxer.c | 1 + + security/landlock/syscalls.c | 2 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/interpreter/.gitignore | 2 + + tools/testing/selftests/interpreter/Makefile | 21 ++ + tools/testing/selftests/interpreter/config | 1 + + .../selftests/interpreter/trust_policy_test.c | 362 +++++++++++++++++++++ + 34 files changed, 627 insertions(+), 13 deletions(-) + create mode 100644 include/uapi/linux/trusted-for.h + create mode 100644 tools/testing/selftests/interpreter/.gitignore + create mode 100644 tools/testing/selftests/interpreter/Makefile + create mode 100644 tools/testing/selftests/interpreter/config + create mode 100644 tools/testing/selftests/interpreter/trust_policy_test.c +Merging rust/rust-next (ced9f62ec435 init/Kconfig: Specify the interpreter for rust-is-available.sh) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging Documentation/index.rst +Auto-merging Documentation/process/changes.rst +CONFLICT (content): Merge conflict in Documentation/process/changes.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/Makefile +Auto-merging include/linux/spinlock.h +Auto-merging init/Kconfig +Auto-merging kernel/kallsyms.c +Auto-merging kernel/livepatch/core.c +Auto-merging kernel/printk/printk.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/vsprintf.c +Auto-merging samples/Kconfig +CONFLICT (content): Merge conflict in samples/Kconfig +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.lib +Auto-merging scripts/kconfig/confdata.c +Auto-merging scripts/min-tool-version.sh +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 commit --no-edit -v -a +[master 2262939d12e8] 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 | 42 + + 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-guidelines.rst | 151 ++ + Documentation/rust/general-information.rst | 80 + + Documentation/rust/index.rst | 21 + + Documentation/rust/quick-start.rst | 231 ++ + MAINTAINERS | 16 + + Makefile | 152 +- + 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 | 80 + + 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 | 50 +- + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 5 +- + lib/Kconfig.debug | 144 ++ + lib/rust.h | 14 + + lib/vsprintf.c | 7 + + rust/.gitignore | 7 + + rust/Makefile | 352 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 427 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 1847 ++++++++++++++ + rust/alloc/collections/mod.rs | 156 ++ + rust/alloc/fmt.rs | 601 +++++ + rust/alloc/lib.rs | 217 ++ + rust/alloc/macros.rs | 126 + + rust/alloc/raw_vec.rs | 549 +++++ + rust/alloc/slice.rs | 1279 ++++++++++ + rust/alloc/str.rs | 624 +++++ + rust/alloc/string.rs | 2864 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 159 ++ + 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 | 3359 ++++++++++++++++++++++++++ + 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 | 508 ++++ + rust/kernel/allocator.rs | 65 + + rust/kernel/amba.rs | 259 ++ + rust/kernel/bindings.rs | 47 + + rust/kernel/bindings_helper.h | 31 + + rust/kernel/buffer.rs | 52 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 209 ++ + rust/kernel/clk.rs | 75 + + rust/kernel/cred.rs | 73 + + rust/kernel/device.rs | 549 +++++ + rust/kernel/driver.rs | 440 ++++ + rust/kernel/error.rs | 542 +++++ + rust/kernel/file.rs | 147 ++ + rust/kernel/file_operations.rs | 726 ++++++ + rust/kernel/gpio.rs | 477 ++++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 227 ++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/irq.rs | 409 ++++ + rust/kernel/lib.rs | 262 ++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 196 ++ + rust/kernel/module_param.rs | 497 ++++ + rust/kernel/of.rs | 63 + + rust/kernel/pages.rs | 162 ++ + rust/kernel/platform.rs | 224 ++ + rust/kernel/power.rs | 118 + + rust/kernel/prelude.rs | 36 + + 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 | 138 ++ + rust/kernel/sync/guard.rs | 181 ++ + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 92 + + rust/kernel/sync/mutex.rs | 112 + + rust/kernel/sync/revocable_mutex.rs | 184 ++ + rust/kernel/sync/seqlock.rs | 202 ++ + 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 | 123 + + samples/rust/Makefile | 13 + + samples/rust/rust_chrdev.rs | 53 + + samples/rust/rust_minimal.rs | 38 + + samples/rust/rust_miscdev.rs | 147 ++ + samples/rust/rust_module_parameters.rs | 72 + + samples/rust/rust_platform.rs | 25 + + samples/rust/rust_print.rs | 57 + + samples/rust/rust_random.rs | 64 + + samples/rust/rust_semaphore.rs | 175 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 40 + + samples/rust/rust_sync.rs | 81 + + scripts/Kconfig.include | 6 +- + scripts/Makefile.build | 22 + + scripts/Makefile.debug | 10 + + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/cc-version.sh | 12 +- + 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/min-tool-version.sh | 6 + + scripts/rust-is-available-bindgen-libclang.h | 2 + + scripts/rust-is-available.sh | 159 ++ + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 162 files changed, 33512 insertions(+), 58 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-guidelines.rst + create mode 100644 Documentation/rust/general-information.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 lib/rust.h + 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/clk.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/platform.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_platform.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 100644 scripts/rust-is-available-bindgen-libclang.h + create mode 100755 scripts/rust-is-available.sh +Merging akpm-current/current (9a3e4418488e ipc/mqueue: use get_tree_nodev() in mqueue_get_tree()) +$ git merge --no-ff akpm-current/current +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/x86/Kconfig +Auto-merging drivers/block/drbd/drbd_int.h +Auto-merging drivers/block/drbd/drbd_req.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging fs/buffer.c +Auto-merging fs/f2fs/compress.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/namespace.c +Auto-merging fs/nilfs2/segbuf.c +Auto-merging fs/xfs/xfs_buf.c +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/kallsyms.h +Auto-merging include/linux/nfs_fs.h +Auto-merging include/linux/sched/sysctl.h +Auto-merging init/main.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sysctl.c +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging lib/vsprintf.c +CONFLICT (modify/delete): tools/testing/radix-tree/linux/gfp.h deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of tools/testing/radix-tree/linux/gfp.h left in tree. +Auto-merging tools/testing/selftests/Makefile +Auto-merging tools/testing/selftests/futex/functional/Makefile +Resolved 'lib/Kconfig.debug' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f tools/testing/radix-tree/linux/gfp.h +rm 'tools/testing/radix-tree/linux/gfp.h' +$ git commit -v -a +[master 046111218656] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 5 + + Documentation/admin-guide/kdump/kdump.rst | 10 +- + Documentation/admin-guide/kernel-parameters.txt | 3 +- + Documentation/admin-guide/mm/damon/usage.rst | 24 +- + Documentation/admin-guide/mm/zswap.rst | 22 +- + Documentation/admin-guide/sysctl/kernel.rst | 31 +- + Documentation/dev-tools/kasan.rst | 17 +- + Documentation/vm/balance.rst | 2 +- + Documentation/vm/page_owner.rst | 29 +- + arch/arm/Kconfig | 4 +- + arch/arm64/Kconfig | 6 +- + arch/arm64/include/asm/vmalloc.h | 6 + + arch/arm64/include/asm/vmap_stack.h | 5 +- + arch/arm64/kernel/module.c | 5 +- + arch/arm64/kernel/setup.c | 3 - + arch/arm64/mm/hugetlbpage.c | 1 + + arch/arm64/mm/init.c | 9 +- + arch/arm64/mm/pageattr.c | 2 +- + arch/arm64/net/bpf_jit_comp.c | 3 +- + arch/hexagon/mm/init.c | 2 - + arch/ia64/kernel/topology.c | 10 - + arch/ia64/mm/discontig.c | 11 +- + arch/mips/kernel/topology.c | 5 - + arch/nds32/mm/init.c | 1 - + arch/openrisc/mm/init.c | 2 - + arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 4 +- + arch/powerpc/kernel/fadump.c | 6 + + arch/powerpc/kernel/sysfs.c | 17 - + arch/powerpc/mm/book3s64/trace.c | 1 - + arch/riscv/Kconfig | 4 +- + arch/riscv/kernel/setup.c | 3 - + arch/riscv/mm/init.c | 6 +- + arch/s390/kernel/module.c | 2 +- + arch/s390/kernel/numa.c | 7 - + arch/sh/kernel/topology.c | 5 - + arch/sparc/kernel/sysfs.c | 12 - + arch/sparc/mm/hugetlbpage.c | 1 + + arch/x86/Kconfig | 7 +- + arch/x86/kernel/module.c | 2 +- + arch/x86/kernel/setup.c | 10 +- + arch/x86/kernel/topology.c | 5 - + arch/x86/mm/init.c | 1 - + block/bfq-iosched.c | 2 +- + drivers/base/init.c | 1 + + drivers/base/memory.c | 8 +- + drivers/base/node.c | 30 +- + drivers/block/drbd/drbd_int.h | 3 - + drivers/block/drbd/drbd_req.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 34 +- + drivers/iommu/tegra-smmu.c | 4 +- + fs/binfmt_elf.c | 65 ++- + fs/buffer.c | 56 +- + fs/ceph/addr.c | 27 - + fs/ceph/super.c | 2 - + fs/ceph/super.h | 2 - + fs/coredump.c | 39 +- + fs/exec.c | 26 +- + fs/ext2/ialloc.c | 5 - + fs/f2fs/compress.c | 6 +- + fs/f2fs/data.c | 9 +- + fs/f2fs/segment.c | 14 +- + fs/f2fs/super.c | 8 +- + fs/fs-writeback.c | 37 -- + fs/fuse/control.c | 17 - + fs/fuse/dev.c | 8 - + fs/minix/inode.c | 3 +- + fs/namei.c | 8 +- + fs/namespace.c | 2 + + fs/nfs/sysctl.c | 7 - + fs/nfs/write.c | 53 +- + fs/nilfs2/segbuf.c | 12 - + fs/ntfs/inode.c | 4 + + fs/ocfs2/file.c | 9 +- + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/stack_user.c | 18 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/pipe.c | 13 +- + fs/proc/base.c | 8 +- + fs/proc/fd.c | 23 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 40 +- + fs/proc/vmcore.c | 43 +- + fs/xfs/xfs_buf.c | 3 - + include/linux/backing-dev-defs.h | 8 - + include/linux/backing-dev.h | 50 -- + include/linux/balloon_compaction.h | 22 - + include/linux/bitfield.h | 3 + + include/linux/cma.h | 2 + + include/linux/compiler_types.h | 2 - + include/linux/damon.h | 13 +- + include/linux/fs.h | 1 + + include/linux/gfp.h | 47 +- + include/linux/highmem-internal.h | 10 + + include/linux/hugetlb.h | 8 +- + include/linux/kallsyms.h | 27 + + include/linux/kasan.h | 97 ++-- + include/linux/kexec.h | 12 +- + include/linux/kfence.h | 2 + + include/linux/log2.h | 4 +- + include/linux/memcontrol.h | 10 +- + include/linux/memory_hotplug.h | 118 ++-- + include/linux/mempolicy.h | 5 +- + include/linux/memremap.h | 14 + + include/linux/migrate.h | 1 + + include/linux/mm.h | 29 +- + include/linux/mm_inline.h | 11 +- + include/linux/mm_types.h | 19 +- + include/linux/mmzone.h | 25 +- + include/linux/nfs_fs.h | 1 - + include/linux/nfs_fs_sb.h | 1 - + include/linux/node.h | 9 + + include/linux/page-flags.h | 90 ++- + include/linux/pagemap.h | 7 - + include/linux/rmap.h | 31 +- + include/linux/sched.h | 8 + + include/linux/sched/sysctl.h | 10 + + include/linux/stddef.h | 6 +- + include/linux/swap.h | 4 - + include/linux/thread_info.h | 5 +- + include/linux/uaccess.h | 2 - + include/linux/vm_event_item.h | 3 + + include/linux/vmalloc.h | 18 +- + include/linux/writeback.h | 15 - + include/trace/events/huge_memory.h | 1 - + include/trace/events/migrate.h | 31 ++ + include/trace/events/mmflags.h | 15 +- + include/trace/events/thp.h | 27 + + include/trace/events/writeback.h | 28 - + init/main.c | 25 +- + ipc/mqueue.c | 14 + + kernel/events/uprobes.c | 7 +- + kernel/fork.c | 1 + + kernel/hung_task.c | 44 ++ + kernel/kcov.c | 98 ++-- + kernel/panic.c | 24 +- + kernel/sched/core.c | 21 +- + kernel/scs.c | 4 +- + kernel/sysctl.c | 84 +-- + lib/Kconfig.debug | 145 ++--- + lib/Kconfig.kasan | 20 +- + lib/Kconfig.kcsan | 11 - + lib/Kconfig.ubsan | 12 - + lib/lz4/lz4_decompress.c | 8 +- + lib/test_hmm.c | 356 +++++++++--- + lib/test_hmm_uapi.h | 22 +- + lib/test_kasan.c | 196 ++++++- + lib/test_printf.c | 8 +- + lib/ubsan.c | 10 +- + lib/vsprintf.c | 13 +- + mm/Kconfig | 6 + + mm/backing-dev.c | 57 -- + mm/balloon_compaction.c | 6 +- + mm/cma.c | 11 +- + mm/cma.h | 1 + + mm/damon/core-test.h | 21 +- + mm/damon/core.c | 36 +- + mm/damon/dbgfs-test.h | 83 ++- + mm/damon/dbgfs.c | 202 ++++--- + mm/damon/reclaim.c | 3 +- + mm/damon/vaddr-test.h | 6 +- + mm/damon/vaddr.c | 10 +- + mm/debug.c | 1 - + mm/fadvise.c | 5 +- + mm/filemap.c | 11 +- + mm/gup.c | 255 +++++---- + mm/highmem.c | 9 +- + mm/hmm.c | 3 +- + mm/huge_memory.c | 186 ++----- + mm/hugetlb.c | 10 +- + mm/hugetlb_vmemmap.c | 68 +-- + mm/internal.h | 79 ++- + mm/kasan/common.c | 4 +- + mm/kasan/hw_tags.c | 193 +++++-- + mm/kasan/kasan.h | 18 +- + mm/kasan/report.c | 10 +- + mm/kasan/shadow.c | 63 ++- + mm/kfence/core.c | 3 +- + mm/kfence/kfence_test.c | 8 +- + mm/khugepaged.c | 25 +- + mm/ksm.c | 15 +- + mm/maccess.c | 6 + + mm/madvise.c | 5 + + mm/memcontrol.c | 68 +-- + mm/memory-failure.c | 18 +- + mm/memory.c | 168 +++--- + mm/memory_hotplug.c | 76 +-- + mm/mempolicy.c | 33 +- + mm/memremap.c | 37 +- + mm/migrate.c | 184 ++++--- + mm/mlock.c | 634 +++++++++------------- + mm/mmap.c | 32 +- + mm/mmzone.c | 14 +- + mm/mprotect.c | 13 +- + mm/oom_kill.c | 2 +- + mm/page-writeback.c | 103 +++- + mm/page_alloc.c | 316 +++++++---- + mm/page_owner.c | 70 ++- + mm/percpu-vm.c | 8 +- + mm/ptdump.c | 16 +- + mm/readahead.c | 6 - + mm/rmap.c | 210 +++---- + mm/sparse-vmemmap.c | 70 ++- + mm/sparse.c | 2 +- + mm/swap.c | 89 +-- + mm/swapfile.c | 104 ---- + mm/usercopy.c | 11 - + mm/userfaultfd.c | 14 +- + mm/vmalloc.c | 203 +++++-- + mm/vmscan.c | 50 +- + mm/vmstat.c | 6 + + mm/zswap.c | 15 +- + scripts/checkpatch.pl | 36 +- + tools/perf/builtin-kmem.c | 1 - + tools/testing/selftests/Makefile | 32 +- + tools/testing/selftests/exec/Makefile | 1 + + tools/testing/selftests/exec/null-argv.c | 78 +++ + tools/testing/selftests/futex/functional/Makefile | 5 +- + tools/testing/selftests/kselftest.h | 10 + + tools/testing/selftests/kvm/Makefile | 2 +- + tools/testing/selftests/landlock/Makefile | 2 +- + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/net/mptcp/Makefile | 2 +- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 5 +- + tools/testing/selftests/vm/hmm-tests.c | 204 ++++++- + tools/testing/selftests/vm/hugepage-mremap.c | 26 +- + tools/testing/selftests/vm/hugepage-vmemmap.c | 144 +++++ + tools/testing/selftests/vm/memfd_secret.c | 2 +- + tools/testing/selftests/vm/run_vmtests.sh | 14 +- + tools/testing/selftests/vm/test_hmm.sh | 24 +- + tools/testing/selftests/vm/userfaultfd.c | 3 + + tools/vm/page_owner_sort.c | 216 ++++++-- + 235 files changed, 4581 insertions(+), 3277 deletions(-) + create mode 100644 tools/testing/selftests/exec/null-argv.c + create mode 100644 tools/testing/selftests/vm/hugepage-vmemmap.c +$ git am -3 ../patches/0001-fix-pu-for-tools-Move-gfp.h-and-slab.h-from-radix-tr.patch +Applying: fix pu for "tools: Move gfp.h and slab.h from radix-tree to lib" +$ git reset HEAD^ +Unstaged changes after reset: +M tools/include/linux/gfp.h +$ git add -A . +$ git commit -v -a --amend +[master 43a9443d5da2] Merge branch 'akpm-current/current' + Date: Thu Feb 10 17:43:17 2022 +1100 +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 707bc2c50c04...43a9443d5da2 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (43a9443d5da2 Merge branch 'akpm-current/current') +$ git merge --no-ff akpm/master +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..d93b3be0b177 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220210 |