diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-12-06 19:44:43 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-12-06 19:44:43 +1100 |
| commit | 5d02ef4b57f6e7d4dcba14d40cf05373a146a605 (patch) | |
| tree | fd0e83d118265f765f0feceabad29140d471225c | |
| parent | 569c3d7746216476caf5b3505be7baccb5f9bd62 (diff) | |
Add linux-next specific files for 20211206next-20211206
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 347 | ||||
| -rw-r--r-- | Next/Trees | 349 | ||||
| -rw-r--r-- | Next/merge.log | 8230 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 8927 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..87c0474c3c2e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,347 @@ +Name SHA1 +---- ---- +origin 944207047ca4dabe8e288f653e7ec6da05e70230 +fixes d06c942efea40e1701ade200477a7449008d9f24 +kbuild-current e851dfae4371d3c751f1e18e8eb5eba993de1467 +arc-current b9cac915c541749864acf02fa7f1b675d6048374 +arm-current 418ace9992a7647c446ed3186df40cf165b67298 +arm64-fixes 35b6b28e69985eafb20b3b2c7bd6eca452b56b53 +arm-soc-fixes 383a44aec91c327ef4a9d03cfa65d1eaf3746c06 +drivers-memory-fixes 8c5ba21c16bd7f8e23b8740dead6eaf164b8caa0 +tee-fixes d58071a8a76d779eedab38033ae4c821c30295a5 +m68k-current 8a3c0a74ae87473589cb881a3854948d40000b7a +powerpc-fixes 3dc709e518b47386e6af937eaec37bb36539edfd +s390-fixes 3c088b1e82cfb7c889823d39846d32079f190f3f +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 2be6d4d16a0849455a5c22490e3c5983495fed00 +bpf 2fa7d94afc1afbb4d702760c058dc2d7ed30f226 +ipsec ec3bb890817e4398f2d46e12e2e205495b116be9 +netfilter b43c2793f5e9910862e8fe07846b74e45b104501 +ipvs 619ca0d0108a5866cca7793bd7e19c5d7a30e750 +wireless-drivers 191587cd1a5f36852a0fc32cff2d5bc7680551db +mac80211 1eda919126b420fee6b8d546f7f728fbbd4b8f11 +rdma-fixes db6169b5bac1c75ed37cfdaedc7dfb1618f3f362 +sound-current b6409dd6bdc03aa178bbff0d80db2a30d29b63ac +sound-asoc-fixes 7dddcb7fe014bdec3e5d6beca18ff50346b7c3b4 +regmap-fixes 459e1cd0d5ec360fb7e601701fbc1179e33de517 +regulator-fixes 6966df483d7b5b218aeb0e13e7e334a8fc3c1744 +spi-fixes 4095fa088b566c9b5a191276c05e2db4e57a9bfe +pci-current 39bd54d43b3f8b3c7b3a75f5d868d8bb858860e7 +driver-core.current 136057256686de39cc3a07c2e39ef6bc43003ff6 +tty.current 9cabe26e65a893afd5846908aa393bd283ab6609 +usb.current 37307f7020ab38dde0892a578249bf63d00bca64 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes d58071a8a76d779eedab38033ae4c821c30295a5 +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy f0ae8685b2858fc1dabf5ea743642abb5f242375 +staging.current d58071a8a76d779eedab38033ae4c821c30295a5 +iio-fixes 893621e0606747c5bbefcaf2794d12c7aa6212b7 +char-misc.current 0edeb8992db8e7de9b8fe3164ace9a4356b17021 +soundwire-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +thunderbolt-fixes d58071a8a76d779eedab38033ae4c821c30295a5 +input-current 1d72d9f960ccf1052a0630a68c3d358791dbdaaa +crypto-current beaaaa37c664e9afdf2913aee19185d8e3793b50 +vfio-fixes 8704e89349080bd640d1755c46d8cdc359a89748 +kselftest-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +modules-fixes 0d67e332e6df72f43eaa21228daa3a79e23093f3 +dmaengine-fixes fa51b16d05583c7aebbc06330afb50276243d198 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 27a030e8729255b2068f35c1cd609b532b263311 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes d40f0b133b44dc8ae2935d935add304496a19044 +reset-fixes 69125b4b9440be015783312e1b8753ec96febde0 +mips-fixes d58071a8a76d779eedab38033ae4c821c30295a5 +at91-fixes dbe68bc9e82b6951ff88285ccffc191d872d9a01 +omap-fixes 80d680fdccba214e8106dc1aa33de5207ad75394 +kvm-fixes ad5b353240c8837109d1bcc6c3a9a501d7f6a960 +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes 0e4190d762ef2609111507e1b9553a166436f556 +nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 0426549c5d7d3704fb9817cd79ed165adb438e89 +vfs-fixes 25f54d08f12feb593e62cc2193fedefaf7825301 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 49201b90af818654c5506a0decc18e111eadcb66 +samsung-krzk-fixes 4f5d06d381badc6e16f6d54eac7ab0125e9a7168 +pinctrl-samsung-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +devicetree-fixes b54472a02cefd0dc468158bbc4d636b27cd6fc34 +scsi-fixes 653926205741add87a6cf452e21950eebc6ac10b +drm-fixes a687efed194bdc185fd7cb33920fe8b4e60ecb9e +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 72641d8d60401a5f1e1a0431ceaf928680d34418 +mmc-fixes 7dba402807a85fa3723f4a27504813caf81cc9d7 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes 136057256686de39cc3a07c2e39ef6bc43003ff6 +hyperv-fixes 1dc2f2b81a6a9895da59f3915760f6c0c3074492 +soc-fsl-fixes 7e5e744183bbb0ad02412b21b1e61380c998dd18 +risc-v-fixes 298d03c2d7f1b5daacb6d4f4053fd3d677d67087 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +spdx fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +gpio-brgl-fixes d6912b1251b47e6b04ea8c8881dfb35a6e7a3e29 +gpio-intel-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +pinctrl-intel-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +erofs-fixes 57bbeacdbee72a54eb97d56b876cf9c94059fc34 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes b5013d084e03e82ceeab4db8ae8ceeaebe76b0eb +cel-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +irqchip-fixes c5e0cbe2858d278a27d5b3fe31890aea5be064c4 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current 8b98436af2c0d6a6fc970700a290666600e2ba13 +efi-fixes 1ff2fc02862d52e18fd3daabcfe840ec27e920a8 +zstd-fixes d58071a8a76d779eedab38033ae4c821c30295a5 +drm-misc-fixes e485382ea7eb4b81f4b59073cd831084820497de +kbuild 373c0a8905200b630da6ac1f0d2d614ee7bdb4e2 +perf 8ab774587903771821b59471cc723bba6d893942 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 9fbd8dc19aa57ec8fe92606043199919527cd9be +asm-generic a0eb2da92b715d0c97b96b09979689ea09faefe6 +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm 0ce29cae5ba48e6c21c5b45a34ae800f1e719b5f +arm64 d58071a8a76d779eedab38033ae4c821c30295a5 +arm-perf e656972b69864348a747954ea187576808000c5a +arm-soc b86314b30dee961692ea602b753e71932824c7e2 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 996b0777eacabd7e5bcc05d32a0c62a301bb3791 +aspeed 16d6dc8d8030dfe88104616cd3dea4e055af506d +at91 f3c0366411d6893360be21a7544595bf275bc9b2 +drivers-memory 7dda5cc4dca06d27c72a3f50814962faa02677af +imx-mxs ee4fb9b87b3ca9ac48478455d835bd41514ed424 +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek c7f6a2bf61cb19c397aaf99ddcbd8435249121cb +mvebu 04e78a787b74b2a8ebece8e59ec0a54230fcf6ae +omap 92d190433bd8fff5595f4641510d0c63b4004632 +qcom ef57a4ffa2e5a7cfa14a6a0921961d32d391670f +raspberrypi 0b8152b86818c26b4909635421f4f4a94c38860b +renesas 168c85dfca1716272b5f75f1fd0e4361cf869546 +reset c4f5b30dda01f2f6979a9681142de454991182ee +rockchip e862cef6cddaed8607637fe671a25e3197656f30 +samsung-krzk 7b8664f50180694052b2f5d531dd39e245dcb884 +scmi ca54383f2adb9414de49a946fb8087dc74ed415c +stm32 1149ccc5e89145a344cfdd8832d83bcc919dc1ed +sunxi 143a666ed34e14539b06a4b19c041c162eb5b4e3 +tee ce352be35ba0957af203567cd0d601a42010e84a +tegra bbd827b4de7ed0e2e5cf701d58fb0de634c2d781 +ti 0ab3ea88b32c03a8eb6b7903ab8a639eb4929f42 +xilinx 326b5e9db528f5b50870f6db3e9fa7f2afbb8f20 +clk e45d8b63eb89b9d11e7349039445898d876c11e9 +clk-imx 9dd81021084ff22cf88a180d720f4f4b47392059 +clk-renesas 33b22d9c3272003a525ba2d6b7b851f3d4f30574 +clk-samsung bcda841f9bf2cddcf2f000cba96f2e27f6f2bdbf +csky e21e52ad1e0126e2a5e2013084ac3f47cf1e887a +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 376e3fdecb0dcae216c0ac559cff066f460bf47b +m68knommu d58071a8a76d779eedab38033ae4c821c30295a5 +microblaze 54b54ea061a83fee5e03ce004fe0804624fa1573 +mips 97ad1d89624df8f3f8f035ff3cdf24bbd9c6d7b1 +nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 433fe39f674d58bc7a3e8254a5d2ffc290b7e04e +parisc-hd afdb4a5b1d340e4afffc65daa21cc71890d7d589 +powerpc af3fdce4ab0781ea183107c90de9cbf21d701c54 +soc-fsl 67a4fa80561fa2ac26668c14b5c64320bddefda8 +risc-v fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +s390 272534ad304ce5a1fe28c708005b1c889cb694f4 +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ab6ff1fda1e8646b27b9d87b718250f8c828ad55 +xtensa bd47cdb78997f83bd170c389ef59de9eec65976a +pidfd 317465bcc6f47088cd1152cf524c68dcdd37fb76 +fscrypt b7e072f9b77f4c516df96e0c22ec09f8b2e76ba1 +fscache b3c088faf78bb988ab01af74dcbbdecda60373d4 +afs 52af7105eceb311b96b3b7971a367f30a70de907 +btrfs 279373dee83ee91b65a30c10792ab8c96114a201 +ceph fd84bfdddd169c219c3a637889a8b87f70a072c2 +cifs 23b55d673d7527b093cd97b7c217c82e70cd1af0 +configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs a0961f351d82d43ab0b845304caa235dfe249ae9 +exfat a671c22ee2d32002141dd9b777f9baa46e8f5a77 +ext3 a48fc69fe6588b48d878d69de223b91a386a7cb4 +ext4 124e7c61deb27d758df5ec0521c36cf08d417f7a +f2fs ac8ef40187ab587b720183235a1094ac6bac1ec8 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 3e2b6fdbdc9ab5a02d9d5676a005f30780b97553 +gfs2 3c5c67ec29a918dfb2ffc94429437794ddd225e8 +jfs c48a14dca2cb57527dde6b960adbe69953935f10 +ksmbd 23b55d673d7527b093cd97b7c217c82e70cd1af0 +nfs 064a91771f7aae4ea2d13033b64e921951d216ce +nfs-anna 8cfb9015280d49f9d92d5b0f88cedf5f0856c0fd +nfsd 136057256686de39cc3a07c2e39ef6bc43003ff6 +cel 60a7808a5c0811961edc3aaf4412204cbb5cc0de +ntfs3 52e00ea6b26e45fb8159e3b57cdde8d3f9bdd8e9 +orangefs ac2c63757f4f413980d6c676dbe1ae2941b94afa +overlayfs 5b0a414d06c3ed2097e32ef7944a4abb644b89bd +ubifs 9aaa6cc099f6c0f0d626f8aecf067df5ce6cd1e9 +v9fs 6e195b0f7c8e50927fa31946369c22a0534ec7e2 +xfs e445976537ad139162980bee015b7364e5b64fff +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap 5ad448ce2976f829d95dcae5e6e91f6686b0e4de +djw-vfs d03ef4daf33a33da8d7c397102fff8ae87d04a93 +file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1 +vfs 8f40da9494cf4dedee1cbbf168b1ce107d3a484d +printk 06cf63cb69be8e9ac963bafef8d1d3ccc48a6078 +pci fcf5ca40c844c084847c4e3ff3968ddec40dfa2a +pstore a5d05b07961a2df47d3b4aae3bdae61ac095a43c +hid 7d859aba56e6c6b240aa0e4add1aaa967d849a69 +i2c 4bca26c18f7b12589161ca04516775771fe01ba3 +i3c a3587e2c0578101900d4abbbd72ab3dad6d5568a +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging 253402129b1ab8db04516df490eb25dfae213550 +jc_docs 065db2d90c6b8384c9072fe55f01c3eeda16c3c0 +v4l-dvb 1f1517fafda598839a02e39968c5063ddcfa51fc +v4l-dvb-next 8cc7a1b2aca067397a016cdb971a5e6ad9b640c7 +pm ece4fd2617f39375db84639369c9a41baf2b3209 +cpufreq-arm 8f5783ad9eb83747471f61f94dbe209fb9fb8a7d +cpupower 79a0dc5530a91694b1e85ef7219893397d85e5bb +devfreq 5cf79c293821d12fd88dee901692cd404247782e +opp 7ca81b690e598fdf16a6c738a466247ef9be7ac7 +thermal 673c68bd48390dad01f7d17670de3e33b60860ac +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 1b9beda83e27a0c2cd75d1cb743c297c7b36c844 +rdma 81ff48ddda0b7e1d4d1251d2a9c8e4059cd9456f +net-next ce83278f313ce65a9bbd780a3e07fa3f62d82525 +bpf-next 64b5b97b8cfff64409fcc234ae3151bc8de0c4d6 +ipsec-next ac1077e92825bb0ffeee8550a41771df772214ce +mlx5-next fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +netfilter-next 632cb151ca5367f0e1774e71837ab5c55cf0fccf +ipvs-next ec574d9ee5d2e74c913cb3e927e7706be7bfb64d +wireless-drivers-next fe6db7eda9306d665f7b8fc3decdb556ec10fb85 +bluetooth dbf6811abbfcc79d3cd5ce1ff53fe1c741167a1f +mac80211-next 75c5bd68b699bbcb6d25879644d62de4da14ab92 +mtd ab14a0c836f88996e4151381a06b632e1524cec7 +nand 33a0da68fb073360d36ce1a0e852f75fede7c21e +spi-nor 228e804599602555e15db467e41a11977757489f +crypto 0ea275df84c389e910a3575a9233075118c173ee +drm c305ae99dfd4d0fe70c7fdf13ef5f7650a804ea7 +drm-misc 4ff22f487f8c26b99cbe1678344595734c001a39 +amdgpu ee641f210a83efe4b32ea367555763e9a072d0f9 +drm-intel dfb924e33927ffa51e197acd58ad1c5edf1b5ff5 +drm-intel-gt 8722ded49ce8a0c706b373e8087eb810684962ff +drm-tegra cef3fb370da3802366dd9567cc4e0d0265f27fc8 +drm-msm fee32807633395e666f0951d6b7b6546e9b76c3d +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv 96894b79596756d71a3e6af5ae6fc5238e058e77 +regmap 02d6fdecb9c38de19065f6bed8d5214556fd061d +sound 1e583aef12aa74afd37c1418255cc4b74e023236 +sound-asoc 0695ad92fe1a0bb7697eb92c6a145a73c5ab0e24 +modules ced75a2f5da71de5775fda44250e27d7b8024355 +input fafc66387dc069140e52739c0c86c8169d44c2dc +block 779d83b81f1039765771d27a7af5252d52f88da2 +device-mapper 1b8d2789dad0005fd5e7d35dab26a8e1203fb6da +libata 815b6cb37e8e9c4da06e7a52d7215a6dc1965e02 +pcmcia e39cdacf2f664b09029e7c1eb354c91a20c367af +mmc f9962ac595d2068035ac2f0873c571585755d8bf +mfd 54d4c88b37595173d7039ea9a57913edfee48f47 +backlight 3976e974df1fd3a718627b0c9bdfee1953baa0d5 +battery 9652c02428f3992129b73321fee32fe60b77c90f +regulator d69e19723f88a3ba6d4e0e52f51dd4c59cc2ae93 +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +integrity 32ba540f3c2a7ef61ed5a577ce25069a3d714fc9 +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 6326948f940dc3f77066d5cdc44ba6afe67830c0 +smack 0934ad42bb2c5df90a1b9de690f93de735b622fe +tomoyo 5d9f4cf36721aba199975a9be7863a3ff5cd4b59 +tpmdd 7eba41fe8c7bb01ff3d4b757bd622375792bc720 +watchdog 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +iommu 86dc40c7ea9c22f64571e0e45f695de73a0e2644 +audit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +devicetree 4e5b6de1f46d0ea0b2e1f76bfc4eb6df03846a03 +mailbox 97961f78e8bc7f50ff7113fec030af6fa5f004d0 +spi e9d7c323cfbbd07c365a419b4ce3dc2f161442c7 +tip 9d8c5461d363a258101e8a7a12e52b5da2e5bbeb +clockevents 453e2cadc97ca52e423852435522eb7d4f4b5b6b +edac 0cfbfbdc97d6aeb92f62d825c457306f98fcaa0e +irqchip 11e45471abea1a69dc3a92b1d1632c4d628b3b98 +ftrace a55f224ff5f238013de8762c4287117e47b86e22 +rcu cd21e779ff218178e90dac267940863be5f60cb3 +kvm da1bfd52b930726288d58f066bd668df9ce15260 +kvm-arm 3d9601d85d14c8c5f9525e23047c1e14336d41b8 +kvms390 3fd8417f2c728d810a3b26d7e2008012ffb7fd01 +xen-tip 00db58cf21188f4b99bc5f15fcc2995e30e4a9fe +percpu a81a52b325ec886eb004ca28b943480dae0353c7 +workqueues 45c753f5f24d2d4717acb38ce35e604ff9abcb50 +drivers-x86 a602f5111fdd3d8a8ea2ac9e61f1c047d9794062 +chrome-platform 297d34e73d491a3edbd6e8c31d33ec90447a908b +hsi a1ee1c08fcd5af03187dcd41dcab12fd5b379555 +leds 66340b5a6f86496125aaf96c53af45cb1a8c4f73 +ipmi 0d075db78c252388bd401cd549600002b0ac07d7 +driver-core c097af1d0a8483b44fa30e86b311991d76b6ae67 +usb e1c72d907f4c3f4f859f0c5890d5326d804625dc +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial d58071a8a76d779eedab38033ae4c821c30295a5 +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty 13a5fad39a7b781c21d9528bcf52a5f5babafe99 +char-misc 70602b37c4afd91c4dfc237121b31310b6c02a7a +extcon 9e6ef3a25e5e13899381282dbd8d8d157a899262 +phy-next 17dcc120fb8d0da4e954ce4386f1376f9cef43d0 +soundwire bb349fd2d58062c69508414a9080d822b8d096b5 +thunderbolt d58071a8a76d779eedab38033ae4c821c30295a5 +vfio 3bf1311f351ef289f2aee79b86bcece2039fa611 +staging c601ab0eb478f66ca30efd2534a818f3d1b91a25 +iio 1d9b750c92d738cb84eb1531dd85147466202b86 +mux aff1016220a5970873700a88538b5d254326abc6 +icc 78e488c462e566cfeeaf022f6028dcb39a4887f1 +dmaengine 7eafa6eed7f1c6d0d7ed2f90792ab6bce462a750 +cgroup e14da77113bb890d7bf9e5d17031bdd476a7ce5e +scsi d08adc366f2dbbb86fcd3fbece90321d211ac6bc +scsi-mkp bf3f120fd61c42c2f4aed8995e5417776d788c37 +vhost 4bd5d4c698259d165058d0c790ac2b14659973ab +rpmsg c4b39a582b9bc29b0e68b9a60c0a6b9cfdc996bc +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl e320d9c2e900d988c82021c80a3cbff488977946 +gpio-intel e1610431b95ccbada74e1393b0944ef4c2750624 +gpio-sim 5065e08e4ef3c3fd0daf141f601de4b4d1af2333 +pinctrl ce646c7757d37e9ff79d5de1cc34ddb60dbbab46 +pinctrl-intel db1b2a8caf5b4954aa62ead5b0580948656eac43 +pinctrl-renesas 7c50a407b8687ae3589c740d2347d9ae73887889 +pinctrl-samsung 16dd3bb5c190654854c0846ee433076139f71c6a +pwm b6ce2af8766c39a5b09afa466ed4d0ef2d8b5a65 +userns 9d3f401c52e3eeeb6cf2c642a8d17879b0e1a3d3 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 60726e868227c55500f690c1a92e346c2d1fad05 +livepatching cd2d68f2d6b2e5cee0b49c13cef052baca8c0b76 +coresight f9809d56513541ca10f67d9666de02384600f109 +rtc 5c0189a8b52f76d8a061d2ec80adb11559742d78 +nvdimm e765f13ed126fe7e41d1a6e3c60d754cd6c2af93 +at24 92e1764787e57417b8890db0f154c0f405548cdd +ntb f96cb827ce49627543b4aabe8d54d8ea9740ae4e +seccomp 1e6d69c7b9cd7735bbf4c6754ccbb9cce8bd8ff4 +kspp 879f756fa9bf9025a3bae61557bcbf56ace0e2de +kspp-gustavo 64bc5a949ae1d2ea3f092672146fbd6f7ce67ada +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss b15c90153fd906af6e70821a301e78d379bd482d +fsi 7cc2f34e1f4da07c791737cc6b3d965b31815ea0 +slimbus fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +nvmem 42f65ea5a727a615b3249374c9bca3140c75778a +xarray f2aa11fd51440360a4a8b61e040eaa7512e21f7e +hyperv 285f68afa8b20f752b0b7194d54980b5e0e27b75 +auxdisplay 4daa9ff89ef27be43c15995412d6aee393a78200 +kgdb b77dbc86d60459b42ab375e4e23172e7245f2854 +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +fpga ea59fc1beff1358966b213b4df89aca3f7dec157 +kunit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +cfi baaf965f94308301d2dc554d72a87d7432cd5ce6 +kunit-next fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +mhi 46827f596963123cac07f253cf205490b8e9e6c9 +memblock e888fa7bb882a1f305526d8f49d7016a7bc5f5ca +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust 988f45dfe7ea7deaeacd2fb528dbc76d05f7304f +cxl 53989fad1286e652ea3655ae3367ba698da8d2ff +folio c035713998700e8843c7d087f55bce3c54c0e3ec +bitmap 785cb064e2f87b6cd2157554f50193dba0642d75 +zstd fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf +efi 720dff78de360ad9742d5f438101cedcdb5dad84 +unicode e2a58d2d3416aceeae63dfc7bf680dd390ff331d +slab d395d823b3aecf8a65774d4abb52decabb960695 +random 442e8775c9e57e0bb00fc518a2574f95bcf0afb6 +akpm-current 9bd91a86f234c961a47d6dcb9f052dd93cc39631 +akpm 4a6df865acade7f2cbdaddeee4b710dcc6462e5b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..1e07b34bf40e --- /dev/null +++ b/Next/Trees @@ -0,0 +1,349 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-fixes +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +cel git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-intel-gt git git://anongit.freedesktop.org/drm-intel#for-linux-next-gt +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +bitmap git https://guthub.com/norov/linux.git#bitmap-master-5.15 +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/linux.git#slab-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/random.git#master +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..cc83eb0e0791 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8230 @@ +$ date -R +Mon, 06 Dec 2021 08:01:22 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a51e3ac43ddb Merge tag 'net-5.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net +Merging origin/master (944207047ca4 Merge tag 'usb-5.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating a51e3ac43ddb..944207047ca4 +Fast-forward (no commit created; -m option ignored) + Documentation/arm64/pointer-authentication.rst | 9 +- + Documentation/cpu-freq/core.rst | 6 +- + MAINTAINERS | 6 ++ + arch/arm64/kernel/entry-ftrace.S | 6 ++ + arch/arm64/kernel/machine_kexec.c | 2 +- + arch/s390/configs/debug_defconfig | 10 +- + arch/s390/configs/defconfig | 7 +- + arch/s390/configs/zfcpdump_defconfig | 2 + + arch/s390/include/asm/pci_io.h | 7 +- + arch/s390/lib/test_unwind.c | 5 +- + arch/x86/entry/entry_64.S | 35 ++++--- + arch/x86/include/asm/intel-family.h | 2 +- + arch/x86/include/asm/kvm_host.h | 1 + + arch/x86/include/asm/sev-common.h | 11 +++ + arch/x86/kernel/fpu/signal.c | 2 +- + arch/x86/kernel/sev.c | 57 +++++++---- + arch/x86/kernel/tsc.c | 28 +++++- + arch/x86/kernel/tsc_sync.c | 41 ++++++++ + arch/x86/kvm/mmu/mmu.c | 23 ++++- + arch/x86/kvm/mmu/paging_tmpl.h | 3 +- + arch/x86/kvm/svm/avic.c | 1 + + arch/x86/kvm/svm/pmu.c | 2 +- + arch/x86/kvm/svm/sev.c | 102 +++++++++++-------- + arch/x86/kvm/vmx/nested.c | 4 +- + arch/x86/kvm/vmx/vmx.c | 1 + + arch/x86/kvm/x86.c | 9 +- + arch/x86/realmode/init.c | 12 ++- + arch/x86/xen/xen-asm.S | 20 ++++ + drivers/ata/libata-sata.c | 2 +- + drivers/ata/pata_falcon.c | 16 +-- + drivers/ata/sata_fsl.c | 20 ++-- + drivers/block/loop.c | 2 +- + drivers/cpufreq/cpufreq.c | 14 +-- + drivers/dma-buf/heaps/system_heap.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 13 +-- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 8 ++ + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 20 +++- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 16 +++ + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 24 +++-- + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 3 + + drivers/gpu/drm/i915/display/intel_dp.c | 11 +++ + drivers/gpu/drm/i915/display/intel_dp.h | 2 + + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 32 ++++-- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 -- + drivers/gpu/drm/msm/Kconfig | 2 +- + drivers/gpu/drm/msm/Makefile | 6 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 20 ++-- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 4 +- + drivers/gpu/drm/msm/dp/dp_aux.c | 17 ++++ + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 + + drivers/gpu/drm/msm/msm_debugfs.c | 1 + + drivers/gpu/drm/msm/msm_drv.c | 49 +++++---- + drivers/gpu/drm/msm/msm_gem.c | 5 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 2 + + drivers/gpu/drm/msm/msm_gpu.h | 3 + + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 13 ++- + drivers/gpu/drm/vc4/vc4_kms.c | 40 ++++---- + drivers/gpu/drm/virtio/virtgpu_drv.c | 42 +------- + drivers/gpu/drm/virtio/virtgpu_drv.h | 1 - + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +- + drivers/i2c/busses/i2c-cbus-gpio.c | 5 +- + drivers/i2c/busses/i2c-rk3x.c | 4 +- + drivers/i2c/busses/i2c-stm32f7.c | 45 +++++++-- + drivers/powercap/dtpm.c | 5 - + drivers/scsi/lpfc/lpfc_els.c | 9 +- + drivers/scsi/ufs/ufshcd-pci.c | 18 ++++ + drivers/tty/serial/8250/8250_bcm7271.c | 13 +++ + drivers/tty/serial/8250/8250_pci.c | 39 +++++--- + drivers/tty/serial/8250/8250_port.c | 7 -- + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/amba-pl011.c | 1 + + drivers/tty/serial/fsl_lpuart.c | 1 + + drivers/tty/serial/liteuart.c | 20 +++- + drivers/tty/serial/msm_serial.c | 3 + + drivers/tty/serial/serial-tegra.c | 4 +- + drivers/tty/serial/serial_core.c | 18 +++- + drivers/usb/cdns3/cdns3-gadget.c | 20 +--- + drivers/usb/cdns3/cdnsp-mem.c | 3 + + drivers/usb/host/xhci-ring.c | 21 ++-- + drivers/usb/typec/tcpm/tcpm.c | 4 - + drivers/vfio/pci/vfio_pci_igd.c | 5 +- + drivers/vfio/vfio.c | 28 +++--- + drivers/video/console/vgacon.c | 14 ++- + fs/cifs/connect.c | 11 +-- + fs/cifs/fscache.c | 46 ++------- + fs/cifs/inode.c | 7 ++ + fs/file.c | 4 + + fs/gfs2/glock.c | 10 +- + fs/gfs2/inode.c | 109 +++++++++------------ + fs/io-wq.c | 7 ++ + fs/xfs/xfs_inode.c | 1 - + include/linux/sched/cputime.h | 5 +- + include/uapi/drm/virtgpu_drm.h | 7 ++ + kernel/sched/core.c | 6 +- + kernel/sched/cputime.c | 12 ++- + kernel/softirq.c | 3 +- + kernel/time/tick-sched.c | 7 ++ + tools/objtool/elf.c | 1 + + tools/objtool/objtool.c | 4 + + 110 files changed, 881 insertions(+), 512 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 (e851dfae4371 Merge tag 'kgdb-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (b9cac915c541 ARC: thread_info.h: correct two typos in a comment) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/include/asm/thread_info.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging arm-current/fixes (418ace9992a7 ARM: 9156/1: drop cc-option fallbacks for architecture selection) +$ 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 (35b6b28e6998 arm64: ftrace: add missing BTIs) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (383a44aec91c memory: mtk-smi: Fix a null dereference for the ostd) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (8c5ba21c16bd memory: mtk-smi: Fix a null dereference for the ostd) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Merge made by the 'recursive' strategy. +Merging tee-fixes/fixes (d58071a8a76d Linux 5.16-rc3) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (3dc709e518b4 powerpc/85xx: Fix oops when CONFIG_FSL_PMC=n) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/platforms/85xx/smp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging s390-fixes/fixes (3c088b1e82cf s390: update defconfigs) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (2be6d4d16a08 net: cdc_ncm: Allow for dwNtbOutMaxSize to be unset or zero) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Merge made by the 'recursive' strategy. + drivers/net/bonding/bond_alb.c | 14 ++++--- + drivers/net/ethernet/altera/altera_tse_main.c | 9 ++-- + drivers/net/ethernet/broadcom/bcm4908_enet.c | 4 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 7 ++++ + drivers/net/usb/cdc_ncm.c | 2 + + include/net/bond_alb.h | 2 +- + include/net/busy_poll.h | 13 ++++++ + net/ipv4/inet_connection_sock.c | 2 +- + net/ipv4/tcp_minisocks.c | 4 +- + tools/testing/selftests/net/fcnal-test.sh | 8 ++++ + tools/testing/selftests/net/fib_tests.sh | 59 ++++++++++++++++++++++----- + tools/testing/selftests/tc-testing/config | 2 + + tools/testing/selftests/tc-testing/tdc.py | 8 ++-- + tools/testing/selftests/tc-testing/tdc.sh | 1 + + 14 files changed, 108 insertions(+), 27 deletions(-) +Merging bpf/master (2fa7d94afc1a bpf: Fix the off-by-two error in range markings) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + Documentation/locking/locktypes.rst | 9 ++---- + arch/mips/net/bpf_jit_comp.h | 2 +- + block/fops.c | 1 + + drivers/gpu/drm/drm_gem_shmem_helper.c | 1 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 1 + + drivers/gpu/drm/i915/i915_request.c | 1 + + drivers/gpu/drm/lima/lima_device.c | 1 + + drivers/gpu/drm/msm/msm_gem_shrinker.c | 1 + + drivers/gpu/drm/ttm/ttm_tt.c | 1 + + drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 1 + + .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.c | 2 ++ + drivers/pci/controller/dwc/pci-exynos.c | 1 + + drivers/pci/controller/dwc/pcie-qcom-ep.c | 1 + + drivers/usb/cdns3/host.c | 1 + + include/linux/bpf.h | 17 ++---------- + include/linux/btf.h | 14 +++++++--- + include/linux/cacheinfo.h | 1 - + include/linux/device/driver.h | 1 + + include/linux/filter.h | 5 +--- + kernel/bpf/btf.c | 11 ++------ + kernel/bpf/verifier.c | 2 +- + lib/Kconfig.debug | 1 + + mm/damon/vaddr.c | 1 + + mm/memory_hotplug.c | 1 + + mm/swap_slots.c | 1 + + net/core/skmsg.c | 5 ++++ + net/core/sock_map.c | 15 ++++++---- + tools/bpf/resolve_btfids/main.c | 8 ++++-- + .../bpf/verifier/xdp_direct_packet_access.c | 32 +++++++++++----------- + 29 files changed, 75 insertions(+), 64 deletions(-) +Merging ipsec/master (ec3bb890817e xfrm: fix dflt policy check when there is no policy configured) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 2 +- + net/ipv6/ip6_gre.c | 5 ++++- + net/xfrm/xfrm_policy.c | 21 +++++++++++++++++++++ + 3 files changed, 26 insertions(+), 2 deletions(-) +Merging netfilter/master (b43c2793f5e9 netfilter: nfnetlink_queue: silence bogus compiler warning) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/nfnetlink_queue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ipvs/master (619ca0d0108a selftests: add arp_ndisc_evict_nocarrier to Makefile) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless-drivers/master (191587cd1a5f mt76: fix key pointer overwrite in mt7921s_write_txwi/mt7663_usb_sdio_write_txwi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git wireless-drivers/master +Already up to date. +Merging mac80211/master (1eda919126b4 nl80211: reset regdom when reloading regdb) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git mac80211/master +Merge made by the 'recursive' strategy. + include/net/regulatory.h | 1 + + net/mac80211/agg-tx.c | 4 ++-- + net/mac80211/mlme.c | 13 ++++++++++--- + net/mac80211/rx.c | 1 + + net/mac80211/sta_info.c | 6 +++--- + net/mac80211/sta_info.h | 2 ++ + net/mac80211/tx.c | 10 +++++----- + net/wireless/reg.c | 27 +++++++++++++++++++++++++-- + 8 files changed, 49 insertions(+), 15 deletions(-) +Merging rdma-fixes/for-rc (db6169b5bac1 RDMA/rtrs: Call {get,put}_cpu_ptr to silence a debug kernel warning) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 14 +++++++++++--- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 6 +++--- + drivers/infiniband/hw/mlx5/mr.c | 26 ++++++++++++-------------- + drivers/infiniband/sw/rxe/rxe_qp.c | 1 + + drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 9 ++++++--- + 6 files changed, 33 insertions(+), 24 deletions(-) +Merging sound-current/for-linus (b6409dd6bdc0 ALSA: ctl: Fix copy of updated id with element read/write) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/control_compat.c | 3 +++ + sound/core/oss/pcm_oss.c | 37 +++++++++++++++++++++++++------------ + 2 files changed, 28 insertions(+), 12 deletions(-) +Merging sound-asoc-fixes/for-linus (7dddcb7fe014 Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/wlf,wm8962.yaml | 3 + + sound/soc/amd/yc/pci-acp6x.c | 3 +- + sound/soc/codecs/rt5682.c | 10 +- + sound/soc/codecs/rt5682s.c | 10 +- + sound/soc/codecs/wcd934x.c | 126 +++++++++++++++------ + sound/soc/codecs/wsa881x.c | 16 ++- + sound/soc/qcom/qdsp6/q6routing.c | 8 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 52 +++++---- + sound/soc/sof/intel/hda-codec.c | 14 ++- + sound/soc/tegra/tegra210_adx.c | 4 +- + sound/soc/tegra/tegra210_amx.c | 4 +- + sound/soc/tegra/tegra210_mixer.c | 4 +- + sound/soc/tegra/tegra210_mvc.c | 8 +- + sound/soc/tegra/tegra210_sfc.c | 4 +- + 14 files changed, 179 insertions(+), 87 deletions(-) +Merging regmap-fixes/for-linus (459e1cd0d5ec Merge remote-tracking branch 'regmap/for-5.15' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merge made by the 'recursive' strategy. +Merging regulator-fixes/for-linus (6966df483d7b regulator: Update protection IRQ helper docs) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + include/linux/regulator/driver.h | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) +Merging spi-fixes/for-linus (4095fa088b56 Merge remote-tracking branch 'spi/for-5.15' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/spi-rockchip.yaml | 1 + + 1 file changed, 1 insertion(+) +Merging pci-current/for-linus (39bd54d43b3f Revert "PCI: aardvark: Fix support for PCI_ROM_ADDRESS1 on emulated bridge") +$ 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 'recursive' strategy. + drivers/pci/controller/pci-aardvark.c | 9 --------- + 1 file changed, 9 deletions(-) +Merging driver-core.current/driver-core-linus (136057256686 Linux 5.16-rc2) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (9cabe26e65a8 serial: 8250_bcm7271: UART errors after resuming from S2) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (37307f7020ab usb: cdnsp: Fix a NULL pointer dereference in cdnsp_endpoint_init()) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (d58071a8a76d Linux 5.16-rc3) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) +$ git merge -m Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-fixes/for-usb-fixes +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +CONFLICT (content): Merge conflict in drivers/usb/chipidea/ci_hdrc_imx.c +Resolved 'drivers/usb/chipidea/ci_hdrc_imx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b59c8f55781a] Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git +$ git diff -M --stat --summary HEAD^.. +Merging phy/fixes (f0ae8685b285 phy: HiSilicon: Fix copy and paste bug in error handling) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml | 2 +- + drivers/phy/hisilicon/phy-hi3670-pcie.c | 4 ++-- + drivers/phy/marvell/phy-mvebu-cp110-utmi.c | 4 ++-- + drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 26 ++++++++++++---------- + drivers/phy/qualcomm/phy-qcom-qmp.c | 3 +++ + drivers/phy/qualcomm/phy-qcom-usb-hsic.c | 2 +- + drivers/phy/st/phy-stm32-usbphyc.c | 2 +- + drivers/phy/ti/phy-am654-serdes.c | 2 +- + drivers/phy/ti/phy-j721e-wiz.c | 2 +- + drivers/phy/ti/phy-omap-usb2.c | 6 ++--- + drivers/phy/ti/phy-tusb1210.c | 2 +- + 11 files changed, 30 insertions(+), 25 deletions(-) +Merging staging.current/staging-linus (d58071a8a76d Linux 5.16-rc3) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (893621e06067 iio: trigger: stm32-timer: fix MODULE_ALIAS) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'recursive' strategy. + drivers/iio/accel/kxcjk-1013.c | 5 ++--- + drivers/iio/accel/kxsd9.c | 6 +++--- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/adc/Kconfig | 2 +- + drivers/iio/adc/ad7768-1.c | 2 +- + drivers/iio/adc/at91-sama5d2_adc.c | 3 ++- + drivers/iio/adc/axp20x_adc.c | 18 +++--------------- + drivers/iio/adc/dln2-adc.c | 21 ++++++++++++--------- + drivers/iio/adc/stm32-adc.c | 3 ++- + drivers/iio/gyro/adxrs290.c | 5 +++-- + drivers/iio/gyro/itg3200_buffer.c | 2 +- + drivers/iio/industrialio-trigger.c | 1 - + drivers/iio/light/ltr501.c | 2 +- + drivers/iio/light/stk3310.c | 6 +++--- + drivers/iio/trigger/stm32-timer-trigger.c | 2 +- + 15 files changed, 36 insertions(+), 44 deletions(-) +Merging char-misc.current/char-misc-linus (0edeb8992db8 misc: rtsx: Avoid mangling IRQ during runtime PM) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 +++++++++ + drivers/bus/mhi/pci_generic.c | 2 +- + drivers/misc/cardreader/rtsx_pcr.c | 4 ---- + drivers/misc/eeprom/at25.c | 38 ++++++++++++++++++-------------------- + drivers/misc/fastrpc.c | 10 ++++++---- + 5 files changed, 34 insertions(+), 29 deletions(-) +Merging soundwire-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (d58071a8a76d Linux 5.16-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 (1d72d9f960cc Input: elantech - fix stack out of bound access in elantech_change_report_id()) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 + + drivers/input/misc/iqs626a.c | 21 +++++----- + drivers/input/mouse/elantech.c | 8 +++- + drivers/input/serio/i8042-x86ia64io.h | 14 +++++++ + drivers/input/serio/i8042.c | 54 ++++++++++++++++--------- + 5 files changed, 70 insertions(+), 29 deletions(-) +Merging crypto-current/master (beaaaa37c664 crypto: api - Fix boot-up crash when crypto manager is disabled) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (8704e8934908 vfio/pci: Fix OpRegion read) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (0d67e332e6df module: fix clang CFI with MODULE_UNLOAD=n) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (fa51b16d0558 dmaengine: idxd: fix calling wq quiesce inside spinlock) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 4 ++-- + drivers/dma/dw-edma/dw-edma-pcie.c | 10 +--------- + drivers/dma/idxd/irq.c | 2 +- + 3 files changed, 4 insertions(+), 12 deletions(-) +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (27a030e87292 mtd: dataflash: Add device-tree SPI IDs) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/devices/mtd_dataflash.c | 8 ++++++++ + drivers/mtd/nand/raw/Kconfig | 2 +- + drivers/mtd/nand/raw/fsmc_nand.c | 36 ++++++++++++++++++++++++++++-------- + drivers/mtd/nand/raw/nand_base.c | 6 +++--- + 4 files changed, 40 insertions(+), 12 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 'recursive' strategy. + drivers/media/platform/rockchip/rga/rga.c | 2 +- + drivers/media/rc/meson-ir-tx.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging reset-fixes/reset/fixes (69125b4b9440 reset: tegra-bpmp: Revert Handle errors in BPMP response) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Merge made by the 'recursive' strategy. + drivers/reset/tegra/reset-bpmp.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) +Merging mips-fixes/mips-fixes (d58071a8a76d Linux 5.16-rc3) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (dbe68bc9e82b ARM: dts: at91: sama7g5ek: to not touch slew-rate for SDMMC pins) +$ 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 (ad5b353240c8 KVM: SVM: Do not terminate SEV-ES guests on GHCB validation failure) +$ 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 (0e4190d762ef hwmon: (sht4x) Fix EREMOTEIO errors) +$ 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 'recursive' strategy. + drivers/hwmon/corsair-psu.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 7 +++---- + drivers/hwmon/nct6775.c | 2 +- + drivers/hwmon/sht4x.c | 4 ++-- + 4 files changed, 7 insertions(+), 8 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 (0426549c5d7d Merge branch 'misc-5.16' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/lzo.c +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (25f54d08f12f autofs: fix wait name hash calculation in autofs_wait()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (49201b90af81 platform/x86: amd-pmc: Fix s2idle failures on certain AMD laptops) +$ 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 'recursive' strategy. + drivers/platform/x86/amd-pmc.c | 2 +- + drivers/platform/x86/lg-laptop.c | 12 ++++++++++++ + drivers/platform/x86/thinkpad_acpi.c | 6 ++++-- + drivers/platform/x86/touchscreen_dmi.c | 18 ++++++++++++++++++ + 4 files changed, 35 insertions(+), 3 deletions(-) +Merging samsung-krzk-fixes/fixes (4f5d06d381ba arm64: dts: exynos: drop samsung,ufs-shareability-reg-offset in ExynosAutov9) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Merge made by the 'recursive' strategy. +Merging pinctrl-samsung-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (b54472a02cef dt-bindings: media: nxp,imx7-mipi-csi2: Drop bad if/then schema) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + .../bindings/iio/adc/samsung,exynos-adc.yaml | 2 +- + .../bindings/media/nxp,imx7-mipi-csi2.yaml | 14 ++--------- + drivers/of/irq.c | 27 ++++++++++++++++++++-- + 3 files changed, 28 insertions(+), 15 deletions(-) +Merging scsi-fixes/fixes (653926205741 scsi: pm80xx: Do not call scsi_remove_host() in pm8001_alloc()) +$ 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 'recursive' strategy. + drivers/scsi/pm8001/pm8001_init.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging drm-fixes/drm-fixes (a687efed194b Merge tag 'drm-intel-fixes-2021-12-02' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (72641d8d6040 Revert "drm/i915: Implement Wa_1508744258") +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (7dba402807a8 mmc: renesas_sdhi: initialize variable properly when tuning) +$ 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 'recursive' strategy. + drivers/mmc/host/renesas_sdhi_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'recursive' strategy. +Merging gnss-fixes/gnss-linus (136057256686 Linux 5.16-rc2) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (1dc2f2b81a6a hv: utils: add PTP_1588_CLOCK to Kconfig to fix build) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + drivers/hv/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging soc-fsl-fixes/fix (7e5e744183bb soc: fsl: dpio: fix qbman alignment error in the virtualization context) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Auto-merging drivers/soc/fsl/dpio/qbman-portal.c +Merge made by the 'recursive' strategy. + drivers/soc/fsl/dpio/qbman-portal.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) +Merging risc-v-fixes/fixes (298d03c2d7f1 riscv: dts: unmatched: Add gpio card detect to mmc-spi-slot) +$ 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 'recursive' strategy. + arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 1 + + arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 2 ++ + 2 files changed, 3 insertions(+) +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 (fa55b7dcdc43 Linux 5.16-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 (d6912b1251b4 gpio: rockchip: needs GENERIC_IRQ_CHIP to fix build errors) +$ 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 +Already up to date. +Merging gpio-intel-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (57bbeacdbee7 erofs: fix deadlock when shrink erofs slab) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (b5013d084e03 Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ 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 (8bb7eca972ad Linux 5.15) +$ 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 (c5e0cbe2858d irqchip: nvic: Fix offset for Interrupt Priority Offsets) +$ 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 'recursive' strategy. + drivers/irqchip/irq-armada-370-xp.c | 16 ++++++---------- + drivers/irqchip/irq-aspeed-scu-ic.c | 4 ++-- + drivers/irqchip/irq-mips-gic.c | 4 ++-- + drivers/irqchip/irq-nvic.c | 2 +- + 4 files changed, 11 insertions(+), 15 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 (8b98436af2c0 Merge tag 'perf-tools-fixes-for-v5.16-2021-11-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ 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 (1ff2fc02862d x86/sme: Explicitly map new EFI memmap table as encrypted) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 1 + + arch/x86/platform/efi/quirks.c | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging zstd-fixes/zstd-linus (d58071a8a76d Linux 5.16-rc3) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (e485382ea7eb drm/ttm: fix ttm_bo_swapout) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/ttm/ttm_bo.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging kbuild/for-next (373c0a890520 [for -next only] kconfig: generate include/generated/rustc_cfg) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Merge made by the 'recursive' strategy. + Documentation/process/changes.rst | 2 +- + arch/Kconfig | 3 +-- + arch/arm/Kconfig.debug | 2 -- + include/linux/slab.h | 3 +-- + init/Kconfig | 1 - + kernel/gcov/Kconfig | 1 - + scripts/kconfig/Makefile | 3 ++- + scripts/kconfig/conf.c | 17 +++++++++------ + scripts/kconfig/confdata.c | 41 ++++++++++++++++++++++++++++++++++++ + scripts/kconfig/streamline_config.pl | 2 +- + scripts/min-tool-version.sh | 2 +- + 11 files changed, 58 insertions(+), 19 deletions(-) +Merging perf/perf/core (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ 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 (9fbd8dc19aa5 dma-mapping: use 'bitmap_zalloc()' when applicable) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (a0eb2da92b71 futex: Wireup futex_waitv syscall) +$ 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 (0ce29cae5ba4 Merge branches 'devel-stable', 'misc' and 'fixes' 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 +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (d58071a8a76d Linux 5.16-rc3) +$ 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 (e656972b6986 drivers/perf: Improve build test coverage) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (b86314b30dee Merge branch 'arm/fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/milbeaut-m10v.dtsi | 9 +++++++++ + 1 file changed, 9 insertions(+) +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (996b0777eaca Merge branch 'v5.17/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 112 ++++++++++----------- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 10 +- + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 83 +++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 14 +++ + 5 files changed, 162 insertions(+), 59 deletions(-) +Merging aspeed/for-next (16d6dc8d8030 ARM: dts: aspeed: mtjade: Add uefi partition) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 267 +++++++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-tyan-s7106.dts | 24 +++ + 2 files changed, 291 insertions(+) +Merging at91/at91-next (f3c0366411d6 ARM: dts: at91: sama7g5-ek: use blocks 0 and 1 of TCB0 as cs and ce) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Already up to date. +Merging drivers-memory/for-next (7dda5cc4dca0 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 +Removing Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt +Merge made by the 'recursive' strategy. + .../bindings/memory-controllers/fsl/fsl,ifc.yaml | 113 +++++++++++++++++++++ + .../bindings/memory-controllers/fsl/ifc.txt | 82 --------------- + .../memory-controllers/renesas,rpc-if.yaml | 54 +++++++--- + drivers/memory/fsl_ifc.c | 9 ++ + drivers/memory/mtk-smi.c | 3 +- + drivers/memory/renesas-rpc-if.c | 109 ++++++++++++-------- + drivers/memory/tegra/tegra210-emc-core.c | 2 +- + drivers/mtd/hyperbus/rpc-if.c | 4 +- + drivers/spi/spi-rpc-if.c | 4 +- + include/memory/renesas-rpc-if.h | 8 +- + 10 files changed, 246 insertions(+), 142 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ifc.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt +Merging imx-mxs/for-next (ee4fb9b87b3c Merge branch 'imx/dt64' 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 +Auto-merging arch/arm/Kconfig.debug +Merge made by the 'recursive' strategy. + arch/arm/Kconfig.debug | 14 ++-- + arch/arm/boot/dts/imx1-pinfunc.h | 6 +- + arch/arm/boot/dts/imx27-pinfunc.h | 6 +- + arch/arm/boot/dts/imx6qp-prtwd3.dts | 2 + + arch/arm/boot/dts/ls1021a-tsn.dts | 2 + + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 6 +- + arch/arm/include/debug/imx-uart.h | 18 ++-- + arch/arm/mach-imx/Kconfig | 12 --- + arch/arm/mach-imx/Makefile | 2 - + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 2 + + .../arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts | 2 - + .../boot/dts/freescale/fsl-lx2160a-bluebox3.dts | 4 + + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 35 ++++++++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 28 +++++++ + .../dts/freescale/imx8mn-beacon-baseboard.dtsi | 1 - + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 28 +++++++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 28 +++++++ + .../arm64/boot/dts/freescale/imx8mq-librem5-r3.dts | 25 +----- + .../boot/dts/freescale/imx8mq-librem5-r3.dtsi | 45 ++++++++++ + .../arm64/boot/dts/freescale/imx8mq-librem5-r4.dts | 16 +--- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 97 +++++++++++++++++++++- + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 1 + + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 28 +++++++ + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 38 +++++++++ + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 28 +++++++ + drivers/soc/imx/gpcv2.c | 3 +- + 26 files changed, 397 insertions(+), 80 deletions(-) + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dtsi +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Already up to date. +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (c7f6a2bf61cb Merge branch 'v5.16-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/mediatek.yaml | 12 +++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/mt6589-fairphone-fp1.dts | 30 ++++++ + arch/arm/boot/dts/mt6589.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/Makefile | 4 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 + + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 8 ++ + .../dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts | 36 +++++++ + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts | 33 +++++++ + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi | 1 - + .../mt8183-kukui-jacuzzi-fennel14-sku2.dts | 17 ++++ + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts | 1 + + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 1 - + .../dts/mediatek/mt8183-kukui-kakadu-sku22.dts | 19 ++++ + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 110 ++++++++++----------- + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 20 ++-- + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 27 ++--- + 19 files changed, 237 insertions(+), 89 deletions(-) + create mode 100644 arch/arm/boot/dts/mt6589-fairphone-fp1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14-sku2.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts +Merging mvebu/for-next (04e78a787b74 arm/arm64: dts: Enable 2.5G Ethernet port on CN9130-CRB) +$ 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 'recursive' strategy. + arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging omap/for-next (92d190433bd8 Merge branch 'omap-for-v5.16/gpmc' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging qcom/for-next (ef57a4ffa2e5 Merge branches 'arm64-for-5.17', 'clk-for-5.17', 'drivers-for-5.17' and 'dts-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 MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 2 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 + + .../devicetree/bindings/soc/qcom/qcom-stats.yaml | 5 + + MAINTAINERS | 9 + + arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 +- + arch/arm/boot/dts/qcom-sdx55-t55.dts | 6 + + arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 59 ++ + arch/arm/boot/dts/qcom-sdx55.dtsi | 80 +++ + arch/arm64/boot/dts/qcom/Makefile | 16 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 10 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 12 + + .../boot/dts/qcom/msm8916-samsung-serranove.dts | 1 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 9 +- + arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 1 - + .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 1 - + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 3 +- + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 30 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 4 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 28 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 3 - + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 3 - + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 1 + + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 2 - + arch/arm64/boot/dts/qcom/pm660.dtsi | 12 +- + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 7 +- + .../boot/dts/qcom/sc7180-trogdor-homestar-r2.dts | 2 + + .../boot/dts/qcom/sc7180-trogdor-homestar-r3.dts | 6 +- + .../boot/dts/qcom/sc7180-trogdor-homestar-r4.dts | 21 + + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 3 - + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts | 2 +- + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts | 31 + + ...s => sc7180-trogdor-lazor-limozeen-nots-r9.dts} | 8 +- + .../dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts | 46 ++ + ...en.dts => sc7180-trogdor-lazor-limozeen-r9.dts} | 6 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 2 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 2 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 9 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 9 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 8 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 22 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 30 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 18 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 3 - + .../dts/qcom/sc7180-trogdor-parade-ps8640.dtsi | 2 + + .../boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 3 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 4 + + arch/arm64/boot/dts/qcom/sc7280-crd.dts | 93 +++ + arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi | 105 +++ + arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 1 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 88 ++- + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 17 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 5 + + .../dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts | 1 + + .../arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts | 351 ++++++++++ + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 + + .../dts/qcom/sdm845-sony-xperia-tama-akari.dts | 13 + + .../dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts | 29 + + .../dts/qcom/sdm845-sony-xperia-tama-apollo.dts | 13 + + .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 438 ++++++++++++ + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 1 + + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 + + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 1 - + arch/arm64/boot/dts/qcom/sm6125.dtsi | 55 ++ + arch/arm64/boot/dts/qcom/sm6350.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 1 + + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 191 ++++++ + arch/arm64/boot/dts/qcom/sm8250.dtsi | 471 +++++++++++++ + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 1 - + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 10 +- + .../dts/qcom/sm8350-sony-xperia-sagami-pdx214.dts | 19 + + .../dts/qcom/sm8350-sony-xperia-sagami-pdx215.dts | 13 + + .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 259 +++++++ + arch/arm64/boot/dts/qcom/sm8350.dtsi | 757 ++++++++++++++++++++- + drivers/soc/qcom/cpr.c | 2 +- + drivers/soc/qcom/llcc-qcom.c | 28 + + drivers/soc/qcom/qcom_aoss.c | 2 +- + drivers/soc/qcom/qcom_stats.c | 13 + + drivers/soc/qcom/qmi_interface.c | 2 +- + drivers/soc/qcom/rpmpd.c | 42 +- + include/dt-bindings/power/qcom-rpmpd.h | 18 + + include/linux/soc/qcom/llcc-qcom.h | 3 + + 83 files changed, 3504 insertions(+), 101 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts + rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-lazor-limozeen-nots.dts => sc7180-trogdor-lazor-limozeen-nots-r9.dts} (60%) + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts + rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-lazor-limozeen.dts => sc7180-trogdor-lazor-limozeen-r9.dts} (82%) + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-crd.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami-pdx214.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami-pdx215.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi +Merging raspberrypi/for-next (0b8152b86818 ARM: dts: bcm2711-rpi-4-b: Add gpio offsets to line name array) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Removing Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt +Merge made by the 'recursive' strategy. + .../bindings/soc/bcm/brcm,bcm2835-vchiq.txt | 17 -------- + .../bindings/soc/bcm/brcm,bcm2835-vchiq.yaml | 45 ++++++++++++++++++++++ + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 28 +++++++------- + arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 +- + arch/arm/boot/dts/bcm2836-rpi.dtsi | 2 +- + 5 files changed, 62 insertions(+), 34 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt + create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml +Merging renesas/next (168c85dfca17 Merge branch 'renesas-drivers-for-v5.17' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 4 + + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 48 ++-- + .../bindings/power/renesas,rcar-sysc.yaml | 1 + + .../devicetree/bindings/reset/renesas,rst.yaml | 1 + + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 16 ++ + .../dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi | 3 + + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 5 +- + arch/arm64/boot/dts/renesas/cat875.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 16 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 16 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 16 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 16 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 16 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 3 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 3 +- + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 35 ++- + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 273 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 63 +++++ + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 42 ++++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 5 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 5 +- + drivers/soc/renesas/rcar-rst.c | 43 +++- + drivers/soc/renesas/renesas-soc.c | 115 +++++---- + include/linux/soc/renesas/rcar-rst.h | 2 + + 28 files changed, 655 insertions(+), 143 deletions(-) +Merging reset/reset/next (c4f5b30dda01 reset: Add of_reset_control_get_optional_exclusive()) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Merge made by the 'recursive' strategy. + include/linux/reset.h | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) +Merging rockchip/for-next (e862cef6cdda Merge branch 'v5.16-armsoc/soc-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 2 +- + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 1 - + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 88 ++++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 14 +++- + .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 11 +++ + .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 11 +++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 11 +++ + 9 files changed, 136 insertions(+), 6 deletions(-) +Merging samsung-krzk/for-next (7b8664f50180 Merge branch 'next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/samsung/pmu.yaml | 2 ++ + arch/arm/Kconfig | 1 - + arch/arm/boot/dts/exynos4210-i9100.dts | 7 +++++-- + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-s3c/Kconfig.s3c64xx | 1 - + arch/arm/mach-s3c/gpio-samsung.c | 1 + + arch/arm/mach-s3c/mach-jive.c | 1 + + arch/arm/mach-s5pv210/Kconfig | 1 - + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/configs/defconfig | 1 + + drivers/i2c/busses/Kconfig | 10 ++-------- + drivers/soc/samsung/exynos-chipid.c | 3 +++ + drivers/soc/samsung/exynos-pmu.c | 2 ++ + 13 files changed, 18 insertions(+), 14 deletions(-) +Merging scmi/for-linux-next (ca54383f2adb Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/arm,scmi.yaml | 65 +++ + drivers/firmware/arm_scmi/Kconfig | 27 + + drivers/firmware/arm_scmi/Makefile | 1 + + drivers/firmware/arm_scmi/common.h | 3 + + drivers/firmware/arm_scmi/driver.c | 3 + + drivers/firmware/arm_scmi/optee.c | 565 +++++++++++++++++++++ + drivers/firmware/arm_scmi/virtio.c | 22 +- + 7 files changed, 675 insertions(+), 11 deletions(-) + create mode 100644 drivers/firmware/arm_scmi/optee.c +Merging stm32/stm32-next (1149ccc5e891 ARM: dts: stm32: fix stusb1600 pinctrl used on stm32mp157c-dk) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/stm32f429-disco.dts | 2 +- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 32 ++++++++++++++++---------------- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 22 ++++++++++++++++++++++ + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 16 ++++++++++++++++ + 4 files changed, 55 insertions(+), 17 deletions(-) +Merging sunxi/sunxi/for-next (143a666ed34e Merge branch 'sunxi/dt-for-5.17' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + .../arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 91 +- + .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 4 + + .../crypto/allwinner,sun4i-a10-crypto.yaml | 10 + + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 3 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 34 +- + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 1 + + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 3 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 3 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 4 + + arch/arm/boot/dts/sun8i-r40.dtsi | 4 +- + arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 3 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 15 +- + arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi | 1 + + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 1 + + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 2 + + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 1 + + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 1 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 14 +- + .../dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 4 + + .../dts/allwinner/sun50i-h6-tanix-tx6-mini.dts | 15 + + .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 138 +- + arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi | 189 +++ + drivers/bus/sunxi-rsb.c | 8 +- + drivers/clk/Makefile | 2 +- + drivers/clk/sunxi-ng/Kconfig | 49 +- + drivers/clk/sunxi-ng/Makefile | 101 +- + drivers/clk/sunxi-ng/ccu-sun20i-d1-r.c | 140 ++ + drivers/clk/sunxi-ng/ccu-sun20i-d1-r.h | 17 + + drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 1390 ++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun20i-d1.h | 15 + + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 58 +- + drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 2 - + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 56 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 33 +- + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 40 +- + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 35 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 40 +- + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 9 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 62 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.h | 2 - + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 65 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 6 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 57 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 7 +- + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 40 +- + drivers/clk/sunxi-ng/ccu_common.c | 6 + + drivers/clk/sunxi-ng/ccu_div.c | 1 + + drivers/clk/sunxi-ng/ccu_div.h | 78 ++ + drivers/clk/sunxi-ng/ccu_frac.c | 6 + + drivers/clk/sunxi-ng/ccu_gate.c | 4 + + drivers/clk/sunxi-ng/ccu_gate.h | 32 +- + drivers/clk/sunxi-ng/ccu_mp.c | 2 + + drivers/clk/sunxi-ng/ccu_mp.h | 49 + + drivers/clk/sunxi-ng/ccu_mult.c | 1 + + drivers/clk/sunxi-ng/ccu_mux.c | 6 + + drivers/clk/sunxi-ng/ccu_mux.h | 33 + + drivers/clk/sunxi-ng/ccu_nk.c | 1 + + drivers/clk/sunxi-ng/ccu_nkm.c | 1 + + drivers/clk/sunxi-ng/ccu_nkmp.c | 1 + + drivers/clk/sunxi-ng/ccu_nm.c | 1 + + drivers/clk/sunxi-ng/ccu_phase.c | 1 + + drivers/clk/sunxi-ng/ccu_reset.c | 1 + + drivers/clk/sunxi-ng/ccu_sdm.c | 6 + + drivers/mmc/host/Kconfig | 1 + + include/dt-bindings/clock/sun20i-d1-ccu.h | 156 +++ + include/dt-bindings/clock/sun20i-d1-r-ccu.h | 19 + + include/dt-bindings/clock/sun50i-a64-ccu.h | 2 +- + include/dt-bindings/clock/sun8i-h3-ccu.h | 2 +- + include/dt-bindings/reset/sun20i-d1-ccu.h | 77 ++ + include/dt-bindings/reset/sun20i-d1-r-ccu.h | 16 + + include/linux/clk/sunxi-ng.h | 15 - + 81 files changed, 2920 insertions(+), 424 deletions(-) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6-mini.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi + create mode 100644 drivers/clk/sunxi-ng/ccu-sun20i-d1-r.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun20i-d1-r.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun20i-d1.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun20i-d1.h + create mode 100644 include/dt-bindings/clock/sun20i-d1-ccu.h + create mode 100644 include/dt-bindings/clock/sun20i-d1-r-ccu.h + create mode 100644 include/dt-bindings/reset/sun20i-d1-ccu.h + create mode 100644 include/dt-bindings/reset/sun20i-d1-r-ccu.h +Merging tee/next (ce352be35ba0 Merge branch 'async_notif' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'recursive' strategy. + .../bindings/arm/firmware/linaro,optee-tz.yaml | 8 + + Documentation/staging/tee.rst | 30 +++ + drivers/tee/optee/Makefile | 1 + + drivers/tee/optee/core.c | 2 +- + drivers/tee/optee/ffa_abi.c | 6 +- + drivers/tee/optee/notif.c | 125 +++++++++++ + drivers/tee/optee/optee_msg.h | 9 + + drivers/tee/optee/optee_private.h | 28 ++- + drivers/tee/optee/optee_rpc_cmd.h | 31 +-- + drivers/tee/optee/optee_smc.h | 75 ++++++- + drivers/tee/optee/rpc.c | 71 +----- + drivers/tee/optee/smc_abi.c | 237 ++++++++++++++++++--- + drivers/tee/tee_core.c | 10 +- + include/linux/tee_drv.h | 14 ++ + 14 files changed, 523 insertions(+), 124 deletions(-) + create mode 100644 drivers/tee/optee/notif.c +Merging tegra/for-next (bbd827b4de7e Merge branch for-5.16/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'recursive' strategy. + drivers/firmware/tegra/bpmp-debugfs.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging ti/ti-next (0ab3ea88b32c 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 'recursive' strategy. + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 8 ++++++++ + arch/arm64/boot/dts/ti/k3-am642.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 6 +++--- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 6 +++--- + drivers/firmware/ti_sci.c | 2 +- + drivers/soc/ti/pruss.c | 2 +- + 8 files changed, 19 insertions(+), 11 deletions(-) +Merging xilinx/for-next (326b5e9db528 Merge branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Auto-merging drivers/firmware/xilinx/zynqmp.c +Merge made by the 'recursive' strategy. + drivers/firmware/xilinx/zynqmp.c | 5 +- + drivers/soc/xilinx/zynqmp_pm_domains.c | 91 +++++++++++++++++++--------------- + drivers/soc/xilinx/zynqmp_power.c | 1 - + 3 files changed, 55 insertions(+), 42 deletions(-) +Merging clk/clk-next (e45d8b63eb89 Merge branch 'clk-fixes' 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 'recursive' strategy. + drivers/clk/clk-gemini.c | 2 +- + drivers/clk/imx/clk-imx8qxp-lpcg.c | 2 +- + drivers/clk/imx/clk-imx8qxp.c | 2 +- + drivers/clk/imx/clk-pllv1.c | 17 ++++++++--------- + drivers/clk/qcom/clk-alpha-pll.c | 9 +++++++++ + drivers/clk/qcom/clk-regmap-mux.c | 2 +- + drivers/clk/qcom/common.c | 12 ++++++++++++ + drivers/clk/qcom/common.h | 2 ++ + drivers/clk/zynq/pll.c | 12 ++++++------ + 9 files changed, 41 insertions(+), 19 deletions(-) +Merging clk-imx/for-next (9dd81021084f clk: imx8mp: Fix the parent clk of the audio_root_clk) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'recursive' strategy. + drivers/clk/imx/clk-imx8mn.c | 6 +++--- + drivers/clk/imx/clk-imx8mp.c | 2 +- + drivers/clk/imx/clk-imx8ulp.c | 1 + + drivers/clk/imx/clk-pllv3.c | 6 +++--- + include/dt-bindings/clock/imx8mp-clock.h | 1 - + 5 files changed, 8 insertions(+), 8 deletions(-) +Merging clk-renesas/renesas-clk (33b22d9c3272 clk: renesas: r9a07g044: Add TSU clock and reset entry) +$ 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 +Auto-merging drivers/mmc/host/renesas_sdhi_core.c +Merge made by the 'recursive' strategy. + .../bindings/clock/renesas,cpg-mssr.yaml | 1 + + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a774b1-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a774c0-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a774e1-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a77965-cpg-mssr.c | 12 +- + drivers/clk/renesas/r8a77980-cpg-mssr.c | 3 +- + drivers/clk/renesas/r8a77990-cpg-mssr.c | 9 +- + drivers/clk/renesas/r8a77995-cpg-mssr.c | 3 +- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 17 +- + drivers/clk/renesas/r9a07g044-cpg.c | 62 +++++- + drivers/clk/renesas/rcar-cpg-lib.c | 211 +++------------------ + drivers/clk/renesas/rcar-cpg-lib.h | 7 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 24 +-- + drivers/clk/renesas/rcar-gen3-cpg.h | 4 + + drivers/clk/renesas/renesas-cpg-mssr.c | 18 +- + drivers/clk/renesas/rzg2l-cpg.c | 18 +- + drivers/clk/renesas/rzg2l-cpg.h | 5 + + drivers/mmc/host/renesas_sdhi.h | 4 + + drivers/mmc/host/renesas_sdhi_core.c | 45 +++-- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 21 ++ + 23 files changed, 269 insertions(+), 264 deletions(-) +Merging clk-samsung/for-next (bcda841f9bf2 clk: samsung: exynos850: Register clocks early) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/samsung,exynos850-clock.yaml | 38 +++ + drivers/clk/samsung/clk-cpu.c | 2 +- + drivers/clk/samsung/clk-cpu.h | 7 - + drivers/clk/samsung/clk-exynos3250.c | 54 ++-- + drivers/clk/samsung/clk-exynos4.c | 41 +-- + drivers/clk/samsung/clk-exynos5250.c | 21 +- + drivers/clk/samsung/clk-exynos5420.c | 29 +- + drivers/clk/samsung/clk-exynos850.c | 329 +++++++++++++++++++-- + drivers/clk/samsung/clk-s3c2410.c | 6 +- + drivers/clk/samsung/clk-s3c64xx.c | 8 +- + drivers/clk/samsung/clk-s5pv210.c | 8 +- + drivers/clk/samsung/clk.c | 14 - + drivers/clk/samsung/clk.h | 36 ++- + include/dt-bindings/clock/exynos4.h | 4 +- + include/dt-bindings/clock/exynos5250.h | 4 +- + include/dt-bindings/clock/exynos850.h | 46 ++- + 16 files changed, 507 insertions(+), 140 deletions(-) +Merging csky/linux-next (e21e52ad1e01 csky: Make HAVE_TCM depend on !COMPILE_TEST) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs) +$ git merge -m Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git h8300/h8300-next +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Removing arch/h8300/mm/memory.c +Auto-merging arch/h8300/mm/init.c +Auto-merging arch/h8300/kernel/setup.c +Removing arch/h8300/include/asm/segment.h +Auto-merging arch/h8300/include/asm/processor.h +Auto-merging arch/h8300/Kconfig.cpu +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 1 - + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/include/asm/processor.h | 1 - + arch/h8300/include/asm/segment.h | 40 -------------------- + arch/h8300/include/asm/thread_info.h | 3 -- + arch/h8300/kernel/entry.S | 1 - + arch/h8300/kernel/head_ram.S | 1 - + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + arch/h8300/mm/Makefile | 2 +- + arch/h8300/mm/init.c | 6 --- + arch/h8300/mm/memory.c | 53 -------------------------- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 24 files changed, 124 insertions(+), 169 deletions(-) + delete mode 100644 arch/h8300/include/asm/segment.h + delete mode 100644 arch/h8300/mm/memory.c +Merging m68k/for-next (376e3fdecb0d m68k: Enable memtest functionality) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + arch/m68k/Kconfig | 1 + + arch/m68k/kernel/setup_mm.c | 15 ++++++--------- + arch/m68k/mm/motorola.c | 2 ++ + 4 files changed, 10 insertions(+), 10 deletions(-) +Merging m68knommu/for-next (d58071a8a76d Linux 5.16-rc3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (54b54ea061a8 microblaze: fix typo in a comment) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/kernel/signal.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mips/mips-next (97ad1d89624d MIPS: TXx9: Let MACH_TX49XX select BOOT_ELF32) +$ 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 'recursive' strategy. + arch/mips/include/asm/mips-cps.h | 19 +++++++------------ + arch/mips/kernel/mips-cpc.c | 3 ++- + arch/mips/mm/c-octeon.c | 2 +- + arch/mips/txx9/Kconfig | 1 + + 4 files changed, 11 insertions(+), 14 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/Makefile +Auto-merging arch/nds32/Kconfig +CONFLICT (content): Merge conflict in arch/nds32/Kconfig +Auto-merging arch/nds32/Kbuild +CONFLICT (content): Merge conflict in arch/nds32/Kbuild +Resolved 'arch/nds32/Kbuild' using previous resolution. +Resolved 'arch/nds32/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 813bf94e327e] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/nds32/Kbuild | 3 +++ + arch/nds32/Kconfig | 4 +++- + arch/nds32/Makefile | 3 --- + 3 files changed, 6 insertions(+), 4 deletions(-) +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (433fe39f674d openrisc: Add clone3 ABI wrapper) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/include/asm/syscalls.h | 2 ++ + arch/openrisc/kernel/entry.S | 27 +++++++++++++-------------- + 2 files changed, 15 insertions(+), 14 deletions(-) +Merging parisc-hd/for-next (afdb4a5b1d34 parisc: Mark cr16 CPU clocksource unstable on all SMP machines) +$ 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 'recursive' strategy. + arch/parisc/Makefile | 5 +++++ + arch/parisc/configs/generic-64bit_defconfig | 14 +++++++++++++- + arch/parisc/install.sh | 1 + + arch/parisc/kernel/time.c | 30 ++++++++--------------------- + drivers/char/agp/parisc-agp.c | 6 +++--- + 5 files changed, 30 insertions(+), 26 deletions(-) +Merging powerpc/next (af3fdce4ab07 Revert "powerpc/code-patching: Improve verification of patchability") +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Removing arch/powerpc/platforms/pseries/scanlog.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 14 + + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/include/asm/asm-prototypes.h | 5 - + arch/powerpc/include/asm/kvm_asm.h | 1 + + arch/powerpc/include/asm/kvm_book3s.h | 6 + + arch/powerpc/include/asm/kvm_book3s_64.h | 5 +- + arch/powerpc/include/asm/kvm_host.h | 7 +- + arch/powerpc/include/asm/kvm_ppc.h | 4 +- + arch/powerpc/include/asm/opal-api.h | 1 + + arch/powerpc/include/asm/ppc-opcode.h | 2 + + arch/powerpc/include/asm/rtas.h | 2 +- + arch/powerpc/include/asm/switch_to.h | 3 + + arch/powerpc/include/asm/time.h | 19 +- + arch/powerpc/kernel/btext.c | 4 +- + arch/powerpc/kernel/cpu_setup_power.c | 12 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 8 +- + arch/powerpc/kernel/eeh_driver.c | 162 +++-- + arch/powerpc/kernel/process.c | 34 + + arch/powerpc/kernel/prom_init.c | 2 +- + arch/powerpc/kernel/rtas.c | 104 ++- + arch/powerpc/kernel/time.c | 54 +- + arch/powerpc/kernel/watchdog.c | 188 ++++- + arch/powerpc/kvm/Kconfig | 15 + + arch/powerpc/kvm/book3s_64_entry.S | 11 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 4 + + arch/powerpc/kvm/book3s_hv.c | 851 +++++++++++----------- + arch/powerpc/kvm/book3s_hv.h | 42 ++ + arch/powerpc/kvm/book3s_hv_builtin.c | 55 +- + arch/powerpc/kvm/book3s_hv_hmi.c | 7 +- + arch/powerpc/kvm/book3s_hv_interrupts.S | 13 +- + arch/powerpc/kvm/book3s_hv_nested.c | 8 +- + arch/powerpc/kvm/book3s_hv_p9_entry.c | 898 ++++++++++++++++++++---- + arch/powerpc/kvm/book3s_hv_ras.c | 54 ++ + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 6 - + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 73 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 15 - + arch/powerpc/net/bpf_jit.h | 17 +- + arch/powerpc/net/bpf_jit_comp.c | 68 +- + arch/powerpc/net/bpf_jit_comp32.c | 101 ++- + arch/powerpc/net/bpf_jit_comp64.c | 72 +- + arch/powerpc/perf/core-book3s.c | 35 + + arch/powerpc/platforms/cell/iommu.c | 1 + + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 1 + + arch/powerpc/platforms/microwatt/rng.c | 2 +- + arch/powerpc/platforms/powernv/idle.c | 9 +- + arch/powerpc/platforms/powernv/opal-lpc.c | 1 + + arch/powerpc/platforms/powernv/setup.c | 10 +- + arch/powerpc/platforms/pseries/Kconfig | 4 - + arch/powerpc/platforms/pseries/Makefile | 1 - + arch/powerpc/platforms/pseries/scanlog.c | 195 ----- + arch/powerpc/sysdev/tsi108_dev.c | 3 +- + arch/powerpc/sysdev/xive/common.c | 212 ++++-- + arch/powerpc/sysdev/xive/native.c | 4 +- + arch/powerpc/sysdev/xive/spapr.c | 38 +- + arch/powerpc/sysdev/xive/xive-internal.h | 1 + + arch/powerpc/xmon/xmon.c | 10 +- + 57 files changed, 2286 insertions(+), 1190 deletions(-) + create mode 100644 arch/powerpc/kvm/book3s_hv.h + delete mode 100644 arch/powerpc/platforms/pseries/scanlog.c +Merging soc-fsl/next (67a4fa80561f soc: fsl: Correct MAINTAINERS database (SOC)) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/freescale/fsl,layerscape-dcfg.txt | 2 +- + Documentation/devicetree/bindings/clock/qoriq-clock.txt | 1 + + MAINTAINERS | 4 ++-- + include/soc/fsl/dpaa2-fd.h | 3 ++- + include/soc/fsl/qe/immap_qe.h | 3 ++- + include/soc/fsl/qe/qe_tdm.h | 4 +++- + include/soc/fsl/qe/ucc_fast.h | 2 +- + include/soc/fsl/qe/ucc_slow.h | 2 +- + 8 files changed, 13 insertions(+), 8 deletions(-) +Merging risc-v/for-next (fa55b7dcdc43 Linux 5.16-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 (272534ad304c Merge branch 'fixes' 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 +Already up to date. +Merge made by the 'recursive' strategy. +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 (ab6ff1fda1e8 uml: x86: add FORCE to user_constants.h) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/include/asm/delay.h | 4 ++-- + arch/um/include/asm/irqflags.h | 4 ++-- + arch/um/include/shared/longjmp.h | 2 +- + arch/um/include/shared/os.h | 4 ++-- + arch/um/kernel/ksyms.c | 2 +- + arch/um/os-Linux/sigio.c | 6 +++--- + arch/um/os-Linux/signal.c | 8 ++++---- + arch/x86/um/Makefile | 2 +- + 8 files changed, 16 insertions(+), 16 deletions(-) +Merging xtensa/xtensa-for-next (bd47cdb78997 xtensa: move section symbols to asm/sections.h) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (317465bcc6f4 Merge branch 'fs.idmapped' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Auto-merging fs/xfs/xfs_inode.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/idmappings.rst | 72 ---------- + fs/cachefiles/bind.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ksmbd/smbacl.c | 19 +-- + fs/ksmbd/smbacl.h | 5 +- + fs/namespace.c | 73 +++++++--- + fs/nfsd/export.c | 2 +- + fs/open.c | 8 +- + fs/overlayfs/super.c | 2 +- + fs/posix_acl.c | 17 ++- + fs/proc_namespace.c | 2 +- + fs/xfs/xfs_inode.c | 8 +- + fs/xfs/xfs_linux.h | 1 + + fs/xfs/xfs_symlink.c | 4 +- + include/linux/fs.h | 141 ++++++------------- + include/linux/mnt_idmapping.h | 234 +++++++++++++++++++++++++++++++ + security/commoncap.c | 15 +- + 17 files changed, 374 insertions(+), 233 deletions(-) + create mode 100644 include/linux/mnt_idmapping.h +Merging fscrypt/master (b7e072f9b77f fscrypt: improve a few comments) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Already up to date. +Merging fscache/fscache-next (b3c088faf78b fscache: Rewrite documentation) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Auto-merging include/linux/fs.h +Auto-merging fs/nfs/inode.c +Removing fs/nfs/fscache-index.c +Auto-merging fs/netfs/read_helper.c +Removing fs/fscache/page.c +Removing fs/fscache/operation.c +Removing fs/fscache/object.c +Removing fs/fscache/netfs.c +Removing fs/fscache/fsdef.c +Auto-merging fs/cifs/inode.c +Auto-merging fs/cifs/fscache.c +CONFLICT (content): Merge conflict in fs/cifs/fscache.c +Auto-merging fs/cifs/connect.c +CONFLICT (content): Merge conflict in fs/cifs/connect.c +Removing fs/cifs/cache.c +Removing fs/cachefiles/rdwr.c +CONFLICT (modify/delete): fs/cachefiles/bind.c deleted in fscache/fscache-next and modified in HEAD. Version HEAD of fs/cachefiles/bind.c left in tree. +Removing fs/afs/cache.c +Auto-merging Documentation/filesystems/netfs_library.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/netfs_library.rst +Removing Documentation/filesystems/caching/operations.rst +Removing Documentation/filesystems/caching/object.rst +Resolved 'Documentation/filesystems/netfs_library.rst' using previous resolution. +Recorded preimage for 'fs/cifs/connect.c' +Resolved 'fs/cifs/fscache.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/cachefiles/bind.c +rm 'fs/cachefiles/bind.c' +$ git commit --no-edit -v -a +Recorded resolution for 'fs/cifs/connect.c'. +[master fe697d63e103] Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/caching/backend-api.rst | 847 +++++-------- + Documentation/filesystems/caching/cachefiles.rst | 6 +- + Documentation/filesystems/caching/fscache.rst | 525 +++----- + Documentation/filesystems/caching/index.rst | 4 +- + Documentation/filesystems/caching/netfs-api.rst | 1082 +++++----------- + Documentation/filesystems/caching/object.rst | 313 ----- + Documentation/filesystems/caching/operations.rst | 210 ---- + Documentation/filesystems/netfs_library.rst | 16 +- + fs/9p/cache.c | 184 +-- + fs/9p/cache.h | 25 +- + fs/9p/v9fs.c | 14 +- + fs/9p/v9fs.h | 13 +- + fs/9p/vfs_addr.c | 52 +- + fs/9p/vfs_dir.c | 11 + + fs/9p/vfs_file.c | 3 +- + fs/9p/vfs_inode.c | 24 +- + fs/9p/vfs_inode_dotl.c | 3 +- + fs/9p/vfs_super.c | 3 + + fs/afs/Makefile | 3 - + fs/afs/cache.c | 68 - + fs/afs/cell.c | 12 - + fs/afs/file.c | 31 +- + fs/afs/inode.c | 101 +- + fs/afs/internal.h | 35 +- + fs/afs/main.c | 14 - + fs/afs/super.c | 1 + + fs/afs/volume.c | 15 +- + fs/afs/write.c | 100 +- + fs/cachefiles/Kconfig | 7 + + fs/cachefiles/Makefile | 6 +- + fs/cachefiles/bind.c | 278 ----- + fs/cachefiles/cache.c | 378 ++++++ + fs/cachefiles/daemon.c | 180 ++- + fs/cachefiles/error_inject.c | 46 + + fs/cachefiles/interface.c | 747 +++++------ + fs/cachefiles/internal.h | 265 ++-- + fs/cachefiles/io.c | 330 +++-- + fs/cachefiles/key.c | 202 ++- + fs/cachefiles/main.c | 22 +- + fs/cachefiles/namei.c | 1221 ++++++++---------- + fs/cachefiles/rdwr.c | 972 --------------- + fs/cachefiles/security.c | 2 +- + fs/cachefiles/volume.c | 118 ++ + fs/cachefiles/xattr.c | 369 ++---- + fs/ceph/Kconfig | 2 +- + fs/cifs/Makefile | 2 +- + fs/cifs/cache.c | 105 -- + fs/cifs/cifsfs.c | 11 +- + fs/cifs/cifsglob.h | 5 +- + fs/cifs/connect.c | 12 - + fs/cifs/file.c | 64 +- + fs/cifs/fscache.c | 297 +---- + fs/cifs/fscache.h | 102 +- + fs/cifs/inode.c | 18 +- + fs/fs-writeback.c | 8 + + fs/fscache/Kconfig | 3 + + fs/fscache/Makefile | 6 +- + fs/fscache/cache.c | 618 ++++----- + fs/fscache/cookie.c | 1385 +++++++++++---------- + fs/fscache/fsdef.c | 98 -- + fs/fscache/internal.h | 315 +---- + fs/fscache/io.c | 368 ++++-- + fs/fscache/main.c | 136 +- + fs/fscache/netfs.c | 74 -- + fs/fscache/object.c | 1125 ----------------- + fs/fscache/operation.c | 633 ---------- + fs/fscache/page.c | 1242 ------------------ + fs/fscache/proc.c | 45 +- + fs/fscache/stats.c | 293 +---- + fs/fscache/volume.c | 509 ++++++++ + fs/namei.c | 3 +- + fs/netfs/read_helper.c | 10 +- + fs/nfs/Makefile | 2 +- + fs/nfs/client.c | 4 - + fs/nfs/direct.c | 2 + + fs/nfs/file.c | 12 +- + fs/nfs/fscache-index.c | 140 --- + fs/nfs/fscache.c | 415 ++---- + fs/nfs/fscache.h | 123 +- + fs/nfs/inode.c | 11 +- + fs/nfs/super.c | 7 +- + fs/nfs/write.c | 1 + + include/linux/fs.h | 4 + + include/linux/fscache-cache.h | 614 ++------- + include/linux/fscache.h | 1003 ++++++--------- + include/linux/netfs.h | 15 +- + include/linux/nfs_fs_sb.h | 9 +- + include/linux/writeback.h | 1 + + include/trace/events/cachefiles.h | 487 ++++++-- + include/trace/events/fscache.h | 627 +++++----- + include/trace/events/netfs.h | 5 +- + 91 files changed, 6650 insertions(+), 13179 deletions(-) + delete mode 100644 Documentation/filesystems/caching/object.rst + delete mode 100644 Documentation/filesystems/caching/operations.rst + delete mode 100644 fs/afs/cache.c + delete mode 100644 fs/cachefiles/bind.c + create mode 100644 fs/cachefiles/cache.c + create mode 100644 fs/cachefiles/error_inject.c + delete mode 100644 fs/cachefiles/rdwr.c + create mode 100644 fs/cachefiles/volume.c + delete mode 100644 fs/cifs/cache.c + delete mode 100644 fs/fscache/fsdef.c + delete mode 100644 fs/fscache/netfs.c + delete mode 100644 fs/fscache/object.c + delete mode 100644 fs/fscache/operation.c + delete mode 100644 fs/fscache/page.c + create mode 100644 fs/fscache/volume.c + delete mode 100644 fs/nfs/fscache-index.c +$ git am -3 ../patches/0001-fix-up-for-fs-add-is_idmapped_mnt-helper.patch +Applying: fix up for "fs: add is_idmapped_mnt() helper" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/cachefiles/cache.c +$ git add -A . +$ git commit -v -a --amend +[master dd1ef9debdde] Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git + Date: Mon Dec 6 09:02:48 2021 +1100 +Merging afs/afs-next (52af7105eceb afs: Set mtime from the client for yfs create operations) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (279373dee83e Fixup merge-to-merge conflict in lzo_compress_pages) +$ 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/lzo.c +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 16 +- + fs/btrfs/block-group.c | 4 +- + fs/btrfs/block-rsv.c | 12 +- + fs/btrfs/block-rsv.h | 4 +- + fs/btrfs/btrfs_inode.h | 18 +- + fs/btrfs/ctree.c | 146 ++++----- + fs/btrfs/ctree.h | 67 ++-- + fs/btrfs/delalloc-space.c | 2 +- + fs/btrfs/delayed-inode.c | 2 +- + fs/btrfs/delayed-ref.c | 4 +- + fs/btrfs/dev-replace.c | 6 +- + fs/btrfs/dir-item.c | 12 +- + fs/btrfs/disk-io.c | 8 +- + fs/btrfs/extent-tree.c | 14 +- + fs/btrfs/file-item.c | 24 +- + fs/btrfs/inode-item.c | 14 +- + fs/btrfs/inode.c | 166 +++++----- + fs/btrfs/ioctl.c | 46 ++- + fs/btrfs/print-tree.c | 8 +- + fs/btrfs/props.c | 7 +- + fs/btrfs/qgroup.c | 19 ++ + fs/btrfs/ref-verify.c | 2 +- + fs/btrfs/reflink.c | 2 +- + fs/btrfs/relocation.c | 19 +- + fs/btrfs/root-tree.c | 6 +- + fs/btrfs/scrub.c | 2 +- + fs/btrfs/send.c | 60 ++-- + fs/btrfs/space-info.c | 84 ++--- + fs/btrfs/space-info.h | 2 +- + fs/btrfs/tests/extent-buffer-tests.c | 17 +- + fs/btrfs/transaction.c | 80 ++--- + fs/btrfs/tree-checker.c | 56 ++-- + fs/btrfs/tree-log.c | 585 ++++++++++++++++------------------- + fs/btrfs/uuid-tree.c | 10 +- + fs/btrfs/verity.c | 2 +- + fs/btrfs/volumes.c | 91 ++++-- + fs/btrfs/xattr.c | 8 +- + fs/btrfs/zoned.c | 80 ++++- + fs/btrfs/zoned.h | 8 +- + include/uapi/linux/btrfs_tree.h | 4 +- + 40 files changed, 895 insertions(+), 822 deletions(-) +Merging ceph/master (fd84bfdddd16 ceph: fix up non-directory creation in SGID directories) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/caps.c | 16 ++++++++-------- + fs/ceph/file.c | 20 ++++++++++++++++---- + fs/ceph/mds_client.c | 3 +-- + 3 files changed, 25 insertions(+), 14 deletions(-) +Merging cifs/for-next (23b55d673d75 Merge tag '5.16-rc3-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Already up to date. +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 (a0961f351d82 erofs: don't trigger WARN() when decompression fails) +$ 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 (a671c22ee2d3 exfat: move super block magic number to magic.h) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/dir.c | 6 +++--- + fs/exfat/exfat_fs.h | 3 --- + fs/exfat/fatent.c | 4 +--- + fs/exfat/file.c | 18 +++++++++--------- + fs/exfat/inode.c | 15 +++++++-------- + fs/exfat/namei.c | 6 +++--- + fs/exfat/super.c | 11 ++++++----- + include/uapi/linux/magic.h | 1 + + 8 files changed, 30 insertions(+), 34 deletions(-) +Merging ext3/for_next (a48fc69fe658 udf: Fix crash after seekdir) +$ 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 (124e7c61deb2 ext4: fix error code saved on super block during file system abort) +$ 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 (ac8ef40187ab f2fs: avoid duplicate call of mark_inode_dirty) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 5 + + fs/f2fs/Kconfig | 1 + + fs/f2fs/compress.c | 32 +-- + fs/f2fs/data.c | 322 +++++---------------- + fs/f2fs/f2fs.h | 22 +- + fs/f2fs/file.c | 491 ++++++++++++++++++++++++++------ + fs/f2fs/inode.c | 13 + + fs/f2fs/iostat.c | 15 +- + fs/f2fs/sysfs.c | 11 + + include/trace/events/f2fs.h | 27 +- + 10 files changed, 544 insertions(+), 395 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 (3e2b6fdbdc9a fuse: send security context of inode on file) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dir.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/fuse/fuse_i.h | 3 ++ + fs/fuse/inode.c | 63 ++++++++++++++++++-------------- + include/uapi/linux/fuse.h | 50 +++++++++++++++++++++++--- + 4 files changed, 176 insertions(+), 31 deletions(-) +Merging gfs2/for-next (3c5c67ec29a9 gfs2: Fix gfs2_instantiate description) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/glock.c | 4 ++-- + fs/gfs2/glops.c | 1 - + fs/gfs2/super.c | 8 +++----- + 3 files changed, 5 insertions(+), 8 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 (23b55d673d75 Merge tag '5.16-rc3-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (064a91771f7a SUNRPC: use different lock keys for INET6 and LOCAL) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (8cfb9015280d NFS: Always provide aligned buffers to the RPC read layers) +$ 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/nfsd-next (136057256686 Linux 5.16-rc2) +$ git merge -m Merge branch 'nfsd-next' of git://git.linux-nfs.org/~bfields/linux.git nfsd/nfsd-next +Already up to date. +Merging cel/for-next (60a7808a5c08 NFSD: Fix inconsistent indenting) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel/for-next +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 200 ++++++++++++++------------------------------- + fs/nfs/callback.c | 32 ++------ + fs/nfsd/netns.h | 13 +-- + fs/nfsd/nfs4proc.c | 2 +- + fs/nfsd/nfs4xdr.c | 71 ++++------------ + fs/nfsd/nfscache.c | 2 +- + fs/nfsd/nfsctl.c | 24 +++--- + fs/nfsd/nfsd.h | 2 +- + fs/nfsd/nfssvc.c | 159 ++++++++++++++++++----------------- + fs/nfsd/stats.c | 2 +- + fs/nfsd/stats.h | 4 +- + include/linux/sunrpc/svc.h | 79 +++++++++--------- + net/sunrpc/svc.c | 175 +++++++++++++++++---------------------- + 13 files changed, 303 insertions(+), 462 deletions(-) +Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/file.c +Merge made by the 'recursive' strategy. + fs/ntfs3/file.c | 12 +++-- + fs/ntfs3/frecord.c | 10 ++-- + fs/ntfs3/fslog.c | 6 ++- + fs/ntfs3/inode.c | 8 +++- + fs/ntfs3/xattr.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++------- + 5 files changed, 145 insertions(+), 27 deletions(-) +Merging orangefs/for-next (ac2c63757f4f orangefs: Fix sb refcount leak when allocate sb info failed.) +$ 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 (5b0a414d06c3 ovl: fix filattr copy-up failure) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (9aaa6cc099f6 ubifs: Document sysfs nodes) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-ubifs | 35 +++++++ + MAINTAINERS | 1 + + drivers/mtd/ubi/debug.c | 2 +- + fs/ubifs/Makefile | 2 +- + fs/ubifs/dir.c | 4 +- + fs/ubifs/io.c | 21 +++++ + fs/ubifs/replay.c | 2 +- + fs/ubifs/super.c | 23 +++-- + fs/ubifs/sysfs.c | 153 +++++++++++++++++++++++++++++++ + fs/ubifs/ubifs.h | 35 +++++++ + 10 files changed, 267 insertions(+), 11 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-fs-ubifs + create mode 100644 fs/ubifs/sysfs.c +Merging v9fs/9p-next (6e195b0f7c8e 9p: fix a bunch of checkpatch warnings) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (e445976537ad xfs: remove incorrect ASSERT in xfs_rename) +$ 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 'recursive' strategy. +Merging iomap/iomap-for-next (5ad448ce2976 iomap: iomap_read_inline_data cleanup) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + include/linux/fs.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging printk/for-next (06cf63cb69be Merge branch 'for-5.16-fixup' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging pci/next (fcf5ca40c844 Merge branch 'pci/errors') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Auto-merging drivers/pci/controller/pci-aardvark.c +Auto-merging drivers/pci/controller/dwc/pci-exynos.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/io.h | 5 +- + arch/arm/mach-dove/pcie.c | 9 +-- + arch/arm/mach-iop32x/pci.c | 5 +- + arch/arm/mach-mv78xx0/pcie.c | 5 +- + arch/arm/mach-orion5x/pci.c | 10 ++- + arch/arm/mm/ioremap.c | 16 +++-- + drivers/pci/access.c | 36 ++++++----- + drivers/pci/controller/dwc/pci-exynos.c | 4 +- + drivers/pci/controller/dwc/pci-keystone.c | 6 +- + drivers/pci/controller/dwc/pcie-designware.c | 7 ++- + drivers/pci/controller/dwc/pcie-histb.c | 4 +- + drivers/pci/controller/dwc/pcie-kirin.c | 4 +- + drivers/pci/controller/dwc/pcie-qcom.c | 12 ++-- + drivers/pci/controller/pci-aardvark.c | 69 ++++++++++++++++++--- + drivers/pci/controller/pci-hyperv.c | 2 +- + drivers/pci/controller/pci-mvebu.c | 62 +++---------------- + drivers/pci/controller/pci-thunder-ecam.c | 46 +++++--------- + drivers/pci/controller/pci-thunder-pem.c | 4 +- + drivers/pci/controller/pci-xgene-msi.c | 6 +- + drivers/pci/controller/pci-xgene.c | 12 ++-- + drivers/pci/controller/pcie-altera.c | 4 +- + drivers/pci/controller/pcie-apple.c | 3 + + drivers/pci/controller/pcie-brcmstb.c | 19 ++++-- + drivers/pci/controller/pcie-iproc.c | 4 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 8 +++ + drivers/pci/controller/pcie-mediatek.c | 11 +--- + drivers/pci/controller/pcie-mt7621.c | 2 +- + drivers/pci/controller/pcie-rcar-host.c | 14 ++--- + drivers/pci/controller/pcie-rockchip-host.c | 4 +- + drivers/pci/controller/pcie-xilinx-nwl.c | 30 +++------ + drivers/pci/controller/vmd.c | 39 +++++++++++- + drivers/pci/hotplug/cpqphp_ctrl.c | 4 +- + drivers/pci/hotplug/pciehp_hpc.c | 17 ++--- + drivers/pci/pci-bridge-emul.c | 49 ++++++++++++++- + drivers/pci/pci.c | 10 +-- + drivers/pci/pcie/aspm.c | 93 +++++++++++++--------------- + drivers/pci/pcie/dpc.c | 4 +- + drivers/pci/pcie/pme.c | 4 +- + drivers/pci/probe.c | 28 +++------ + drivers/pci/quirks.c | 9 +++ + drivers/pci/switch/switchtec.c | 11 +++- + drivers/pcmcia/at91_cf.c | 6 +- + include/linux/pci.h | 9 +++ + 43 files changed, 398 insertions(+), 308 deletions(-) +Merging pstore/for-next/pstore (a5d05b07961a pstore/ftrace: Allow immediate recording) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/ftrace.c | 46 ++++++++++++++++++++++++++++++---------------- + 1 file changed, 30 insertions(+), 16 deletions(-) +Merging hid/for-next (7d859aba56e6 Merge branch 'for-5.16/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 ++ + drivers/hid/Kconfig | 10 +-- + drivers/hid/hid-apple.c | 107 +++++++++++++++++++++++++---- + drivers/hid/hid-asus.c | 6 +- + drivers/hid/hid-bigbenff.c | 2 +- + drivers/hid/hid-chicony.c | 3 + + drivers/hid/hid-core.c | 93 +++++++++++++++++++++++++ + drivers/hid/hid-corsair.c | 7 +- + drivers/hid/hid-elan.c | 2 +- + drivers/hid/hid-elo.c | 3 + + drivers/hid/hid-ft260.c | 3 + + drivers/hid/hid-google-hammer.c | 2 + + drivers/hid/hid-holtek-kbd.c | 9 ++- + drivers/hid/hid-holtek-mouse.c | 9 +++ + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-lg.c | 10 ++- + drivers/hid/hid-logitech-dj.c | 2 +- + drivers/hid/hid-magicmouse.c | 94 +++++++++++++++++++++++-- + drivers/hid/hid-prodikeys.c | 10 ++- + drivers/hid/hid-quirks.c | 1 + + drivers/hid/hid-roccat-arvo.c | 3 + + drivers/hid/hid-roccat-isku.c | 3 + + drivers/hid/hid-roccat-kone.c | 3 + + drivers/hid/hid-roccat-koneplus.c | 3 + + drivers/hid/hid-roccat-konepure.c | 3 + + drivers/hid/hid-roccat-kovaplus.c | 3 + + drivers/hid/hid-roccat-lua.c | 3 + + drivers/hid/hid-roccat-pyra.c | 3 + + drivers/hid/hid-roccat-ryos.c | 3 + + drivers/hid/hid-roccat-savu.c | 3 + + drivers/hid/hid-samsung.c | 3 + + drivers/hid/hid-sony.c | 24 +++++-- + drivers/hid/hid-thrustmaster.c | 3 + + drivers/hid/hid-u2fzero.c | 2 +- + drivers/hid/hid-uclogic-core.c | 3 + + drivers/hid/hid-uclogic-params.c | 3 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 20 +++--- + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 6 +- + drivers/hid/surface-hid/surface_hid_core.c | 25 ++----- + drivers/hid/usbhid/hid-core.c | 19 +++-- + drivers/hid/wacom_sys.c | 19 +++-- + include/linux/hid.h | 83 ++++++---------------- + 42 files changed, 462 insertions(+), 159 deletions(-) +Merging i2c/i2c/for-next (4bca26c18f7b 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 +Removing drivers/i2c/busses/i2c-xlr.c +Auto-merging drivers/i2c/busses/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 2 + + drivers/i2c/busses/Kconfig | 16 +- + drivers/i2c/busses/Makefile | 1 - + drivers/i2c/busses/i2c-designware-core.h | 13 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 2 + + drivers/i2c/busses/i2c-i801.c | 250 ++++------- + drivers/i2c/busses/i2c-imx.c | 92 +++- + drivers/i2c/busses/i2c-mpc.c | 23 +- + drivers/i2c/busses/i2c-rk3x.c | 7 + + drivers/i2c/busses/i2c-stm32f7.c | 14 +- + drivers/i2c/busses/i2c-tegra.c | 52 ++- + drivers/i2c/busses/i2c-xlp9xx.c | 7 - + drivers/i2c/busses/i2c-xlr.c | 470 --------------------- + drivers/i2c/i2c-core-base.c | 2 + + drivers/i2c/muxes/i2c-mux-gpio.c | 53 +-- + 15 files changed, 251 insertions(+), 753 deletions(-) + delete mode 100644 drivers/i2c/busses/i2c-xlr.c +Merging i3c/i3c/next (a3587e2c0578 i3c: fix incorrect address slot lookup on 64-bit) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master.c | 3 ++- + drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +- + drivers/i3c/master/mipi-i3c-hci/hci.h | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (253402129b1a hwmon: (sht4x) Add device tree match table) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Removing include/linux/platform_data/ntc_thermistor.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ti,ina2xx.yaml | 22 + + Documentation/hwmon/asus_wmi_ec_sensors.rst | 38 + + Documentation/hwmon/asus_wmi_sensors.rst | 78 ++ + Documentation/hwmon/ina238.rst | 56 ++ + Documentation/hwmon/index.rst | 3 + + MAINTAINERS | 14 + + arch/x86/kernel/amd_nb.c | 5 + + drivers/hwmon/Kconfig | 42 +- + drivers/hwmon/Makefile | 3 + + drivers/hwmon/adm1021.c | 23 +- + drivers/hwmon/asus_wmi_ec_sensors.c | 621 +++++++++++++++ + drivers/hwmon/asus_wmi_sensors.c | 664 ++++++++++++++++ + drivers/hwmon/f71882fg.c | 2 + + drivers/hwmon/ina238.c | 644 +++++++++++++++ + drivers/hwmon/jc42.c | 4 + + drivers/hwmon/k10temp.c | 36 +- + drivers/hwmon/ntc_thermistor.c | 148 ++-- + drivers/hwmon/sht4x.c | 7 + + drivers/hwmon/tmp401.c | 863 ++++++++++----------- + include/linux/pci_ids.h | 1 + + include/linux/platform_data/ntc_thermistor.h | 50 -- + 21 files changed, 2730 insertions(+), 594 deletions(-) + create mode 100644 Documentation/hwmon/asus_wmi_ec_sensors.rst + create mode 100644 Documentation/hwmon/asus_wmi_sensors.rst + create mode 100644 Documentation/hwmon/ina238.rst + create mode 100644 drivers/hwmon/asus_wmi_ec_sensors.c + create mode 100644 drivers/hwmon/asus_wmi_sensors.c + create mode 100644 drivers/hwmon/ina238.c + delete mode 100644 include/linux/platform_data/ntc_thermistor.h +Merging jc_docs/docs-next (065db2d90c6b docs/zh_CN: Add zh_CN/accounting/taskstats.rst) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging MAINTAINERS +Auto-merging Documentation/process/changes.rst +Merge made by the 'recursive' strategy. + .../admin-guide/blockdev/drbd/figures.rst | 4 +- + .../drbd/{node-states-8.dot => peer-states-8.dot} | 5 - + Documentation/arc/arc.rst | 81 +++++++++ + Documentation/arc/features.rst | 3 + + Documentation/arc/index.rst | 17 ++ + Documentation/arch.rst | 1 + + Documentation/conf.py | 15 +- + Documentation/networking/rds.rst | 2 +- + Documentation/process/changes.rst | 11 ++ + Documentation/process/submitting-patches.rst | 3 +- + Documentation/translations/zh_CN/PCI/index.rst | 5 +- + .../translations/zh_CN/PCI/pci-iov-howto.rst | 170 ++++++++++++++++++ + .../translations/zh_CN/PCI/pciebus-howto.rst | 192 +++++++++++++++++++++ + .../translations/zh_CN/accounting/index.rst | 2 +- + .../translations/zh_CN/accounting/taskstats.rst | 145 ++++++++++++++++ + .../translations/zh_CN/dev-tools/index.rst | 2 +- + .../zh_CN/{sparse.txt => dev-tools/sparse.rst} | 67 ++++--- + MAINTAINERS | 1 + + 18 files changed, 683 insertions(+), 43 deletions(-) + rename Documentation/admin-guide/blockdev/drbd/{node-states-8.dot => peer-states-8.dot} (71%) + create mode 100644 Documentation/arc/arc.rst + create mode 100644 Documentation/arc/features.rst + create mode 100644 Documentation/arc/index.rst + create mode 100644 Documentation/translations/zh_CN/PCI/pci-iov-howto.rst + create mode 100644 Documentation/translations/zh_CN/PCI/pciebus-howto.rst + create mode 100644 Documentation/translations/zh_CN/accounting/taskstats.rst + rename Documentation/translations/zh_CN/{sparse.txt => dev-tools/sparse.rst} (58%) +Merging v4l-dvb/master (1f1517fafda5 media: cx18: drop an unused macro) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Removing drivers/staging/media/atomisp/pci/sh_css_stream.c +Removing drivers/staging/media/atomisp/pci/sh_css_shading.c +Removing drivers/staging/media/atomisp/pci/sh_css_morph.c +Removing drivers/staging/media/atomisp/pci/sh_css_metadata.c +Removing drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_states.c +Removing drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_configs.c +Removing drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_params.c +Removing drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_configs.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/i2c/adv748x.txt +Merge made by the 'recursive' strategy. + .../admin-guide/media/platform-cardlist.rst | 1 + + .../devicetree/bindings/media/i2c/adv748x.txt | 116 - + .../devicetree/bindings/media/i2c/adv748x.yaml | 212 ++ + .../devicetree/bindings/media/st,stm32-dma2d.yaml | 71 + + Documentation/driver-api/media/drivers/index.rst | 1 + + .../userspace-api/media/cec/cec-ioc-receive.rst | 49 +- + Documentation/userspace-api/media/v4l/biblio.rst | 10 + + .../userspace-api/media/v4l/capture.c.rst | 52 +- + Documentation/userspace-api/media/v4l/control.rst | 9 + + .../media/v4l/ext-ctrls-codec-stateless.rst | 573 ++++ + .../userspace-api/media/v4l/pixfmt-compressed.rst | 15 + + .../userspace-api/media/v4l/v4l2grab.c.rst | 8 +- + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 8 + + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 12 + + .../userspace-api/media/videodev2.h.rst.exceptions | 2 + + MAINTAINERS | 7 + + drivers/media/Kconfig | 8 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 8 +- + drivers/media/dvb-core/dmxdev.c | 30 +- + drivers/media/dvb-core/dvb_demux.c | 12 +- + drivers/media/dvb-core/dvb_frontend.c | 8 +- + drivers/media/dvb-core/dvb_vb2.c | 4 - + drivers/media/dvb-core/dvbdev.c | 12 +- + drivers/media/dvb-frontends/cx24113.c | 2 +- + drivers/media/dvb-frontends/dib9000.c | 4 +- + drivers/media/dvb-frontends/s5h1411.c | 2 +- + drivers/media/dvb-frontends/si2168.c | 43 +- + drivers/media/dvb-frontends/si2168_priv.h | 2 +- + drivers/media/dvb-frontends/sp887x.c | 4 +- + drivers/media/dvb-frontends/stv0367.c | 6 +- + drivers/media/i2c/ccs/ccs-core.c | 12 +- + drivers/media/i2c/dw9768.c | 6 + + drivers/media/pci/b2c2/flexcop-pci.c | 3 + + drivers/media/pci/cx18/cx18-alsa-main.c | 6 - + drivers/media/pci/cx25821/cx25821-core.c | 7 - + drivers/media/pci/intel/ipu3/cio2-bridge.c | 4 +- + drivers/media/pci/ivtv/ivtv-alsa-main.c | 6 - + drivers/media/pci/tw5864/tw5864-core.c | 5 +- + drivers/media/platform/Kconfig | 12 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/aspeed-video.c | 14 +- + drivers/media/platform/coda/coda-common.c | 8 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 1 + + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 1 - + .../platform/mtk-vcodec/mtk_vcodec_dec_stateless.c | 1 - + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 10 + + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 1 - + .../platform/mtk-vcodec/vdec/vdec_h264_req_if.c | 4 +- + .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 9 +- + .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 3 +- + drivers/media/platform/mtk-vcodec/venc_vpu_if.c | 1 - + drivers/media/platform/mtk-vcodec/venc_vpu_if.h | 1 - + drivers/media/platform/mtk-vpu/mtk_vpu.c | 4 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 10 + + drivers/media/platform/s5p-mfc/s5p_mfc.c | 9 +- + drivers/media/platform/stm32/Makefile | 2 + + drivers/media/platform/stm32/dma2d/dma2d-hw.c | 133 + + drivers/media/platform/stm32/dma2d/dma2d-regs.h | 113 + + drivers/media/platform/stm32/dma2d/dma2d.c | 739 +++++ + drivers/media/platform/stm32/dma2d/dma2d.h | 135 + + drivers/media/rc/Kconfig | 2 +- + drivers/media/rc/ir-rx51.c | 16 +- + drivers/media/rc/ir-spi.c | 6 - + drivers/media/rc/mceusb.c | 8 +- + drivers/media/rc/pwm-ir-tx.c | 18 +- + drivers/media/rc/redrat3.c | 22 +- + drivers/media/usb/b2c2/flexcop-usb.c | 10 +- + drivers/media/usb/b2c2/flexcop-usb.h | 12 +- + drivers/media/usb/cpia2/cpia2_usb.c | 4 +- + drivers/media/usb/dvb-usb/dib0700_core.c | 28 +- + drivers/media/usb/em28xx/em28xx-cards.c | 18 +- + drivers/media/usb/em28xx/em28xx-core.c | 4 +- + drivers/media/usb/gspca/m5602/m5602_s5k83a.c | 5 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 8 +- + drivers/media/usb/s2255/s2255drv.c | 4 +- + drivers/media/usb/stk1160/stk1160-core.c | 4 +- + drivers/media/v4l2-core/Kconfig | 4 + + drivers/media/v4l2-core/Makefile | 1 + + drivers/media/v4l2-core/v4l2-ctrls-core.c | 180 ++ + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 20 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 5 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 21 + + drivers/media/v4l2-core/v4l2-vp9.c | 1850 +++++++++++ + drivers/staging/media/Kconfig | 2 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/atomisp/Makefile | 24 +- + drivers/staging/media/atomisp/TODO | 191 +- + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 119 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 121 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 130 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 313 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 118 +- + drivers/staging/media/atomisp/i2c/gc0310.h | 3 +- + drivers/staging/media/atomisp/i2c/gc2235.h | 3 +- + drivers/staging/media/atomisp/i2c/ov2680.h | 207 +- + drivers/staging/media/atomisp/i2c/ov2722.h | 3 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 245 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 6 +- + drivers/staging/media/atomisp/pci/atomisp_compat.h | 2 - + .../media/atomisp/pci/atomisp_compat_css20.c | 92 +- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 43 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 21 +- + .../staging/media/atomisp/pci/atomisp_internal.h | 7 + + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 309 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 54 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 4 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 33 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.h | 3 +- + .../atomisp/pci/camera/pipe/src/pipe_binarydesc.c | 25 +- + .../pci/css_2400_system/hive/ia_css_isp_configs.c | 386 --- + .../pci/css_2400_system/hive/ia_css_isp_params.c | 3420 -------------------- + .../pci/css_2401_system/hive/ia_css_isp_configs.c | 386 --- + .../pci/css_2401_system/hive/ia_css_isp_states.c | 224 -- + .../atomisp/pci/hive_isp_css_common/host/gdc.c | 11 - + .../staging/media/atomisp/pci/ia_css_acc_types.h | 5 - + .../media/atomisp/pci/ia_css_event_public.h | 17 +- + .../staging/media/atomisp/pci/ia_css_isp_configs.c | 321 ++ + .../staging/media/atomisp/pci/ia_css_isp_configs.h | 119 +- + .../{css_2401_system/hive => }/ia_css_isp_params.c | 23 - + .../staging/media/atomisp/pci/ia_css_isp_params.h | 3 - + .../{css_2400_system/hive => }/ia_css_isp_states.c | 0 + drivers/staging/media/atomisp/pci/ia_css_pipe.h | 4 +- + .../staging/media/atomisp/pci/ia_css_pipe_public.h | 26 - + drivers/staging/media/atomisp/pci/ia_css_stream.h | 4 - + .../media/atomisp/pci/ia_css_stream_public.h | 19 +- + .../staging/media/atomisp/pci/input_system_local.h | 134 + + .../pci/isp/kernels/bh/bh_2/ia_css_bh.host.c | 2 - + .../copy_output_1.0/ia_css_copy_output.host.c | 8 +- + .../copy_output_1.0/ia_css_copy_output.host.h | 6 +- + .../isp/kernels/crop/crop_1.0/ia_css_crop.host.c | 28 +- + .../isp/kernels/crop/crop_1.0/ia_css_crop.host.h | 14 +- + .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 8 +- + .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h | 6 +- + .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 28 +- + .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h | 14 +- + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.c | 1 - + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.h | 1 - + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_param.h | 1 - + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h | 1 - + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 16 +- + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 6 +- + .../yuv444_io_ls/ia_css_yuv444_io.host.c | 18 +- + .../yuv444_io_ls/ia_css_yuv444_io.host.h | 6 +- + .../iterator/iterator_1.0/ia_css_iterator.host.c | 11 +- + .../kernels/output/output_1.0/ia_css_output.host.c | 69 +- + .../kernels/output/output_1.0/ia_css_output.host.h | 42 +- + .../kernels/qplane/qplane_2/ia_css_qplane.host.c | 30 +- + .../kernels/qplane/qplane_2/ia_css_qplane.host.h | 16 +- + .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 38 +- + .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.h | 22 +- + .../raw_aa_binning_1.0/ia_css_raa.host.c | 2 - + .../pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.c | 30 +- + .../pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.h | 16 +- + .../pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c | 5 - + .../pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c | 68 - + .../pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.h | 33 - + .../pci/isp/kernels/sc/sc_1.0/ia_css_sc_types.h | 14 - + .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 33 +- + .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h | 14 +- + .../pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h | 4 +- + .../pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 32 +- + .../pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.h | 8 +- + .../atomisp/pci/isp/modes/interface/isp_const.h | 14 +- + .../media/atomisp/pci/isp2400_input_system_local.h | 126 - + .../atomisp/pci/isp2401_input_system_global.h | 12 - + .../media/atomisp/pci/isp2401_input_system_local.h | 26 - + .../pci/runtime/binary/interface/ia_css_binary.h | 3 - + .../media/atomisp/pci/runtime/binary/src/binary.c | 513 +-- + .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 2 +- + .../pci/runtime/frame/interface/ia_css_frame.h | 24 +- + .../media/atomisp/pci/runtime/frame/src/frame.c | 116 +- + .../atomisp/pci/runtime/isys/src/virtual_isys.c | 11 - + .../atomisp/pci/runtime/pipeline/src/pipeline.c | 3 +- + drivers/staging/media/atomisp/pci/sh_css.c | 2047 ++++-------- + drivers/staging/media/atomisp/pci/sh_css_defs.h | 58 +- + .../staging/media/atomisp/pci/sh_css_firmware.c | 16 +- + .../staging/media/atomisp/pci/sh_css_firmware.h | 3 - + .../staging/media/atomisp/pci/sh_css_internal.h | 36 +- + .../staging/media/atomisp/pci/sh_css_metadata.c | 17 - + drivers/staging/media/atomisp/pci/sh_css_metrics.c | 25 - + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 197 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.h | 17 +- + drivers/staging/media/atomisp/pci/sh_css_morph.c | 17 - + .../media/atomisp/pci/sh_css_param_shading.c | 82 +- + drivers/staging/media/atomisp/pci/sh_css_params.c | 247 +- + drivers/staging/media/atomisp/pci/sh_css_params.h | 8 - + drivers/staging/media/atomisp/pci/sh_css_shading.c | 17 - + drivers/staging/media/atomisp/pci/sh_css_sp.c | 131 +- + drivers/staging/media/atomisp/pci/sh_css_sp.h | 7 +- + drivers/staging/media/atomisp/pci/sh_css_stream.c | 17 - + drivers/staging/media/atomisp/pci/system_global.h | 3 - + drivers/staging/media/hantro/Kconfig | 1 + + drivers/staging/media/hantro/Makefile | 7 +- + drivers/staging/media/hantro/hantro.h | 41 +- + drivers/staging/media/hantro/hantro_drv.c | 23 +- + drivers/staging/media/hantro/hantro_g2.c | 26 + + drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 71 +- + drivers/staging/media/hantro/hantro_g2_regs.h | 132 +- + drivers/staging/media/hantro/hantro_g2_vp9_dec.c | 980 ++++++ + drivers/staging/media/hantro/hantro_hw.h | 115 +- + drivers/staging/media/hantro/hantro_postproc.c | 81 +- + drivers/staging/media/hantro/hantro_v4l2.c | 20 + + drivers/staging/media/hantro/hantro_vp9.c | 240 ++ + drivers/staging/media/hantro/hantro_vp9.h | 102 + + drivers/staging/media/hantro/imx8m_vpu_hw.c | 38 +- + drivers/staging/media/hantro/rockchip_vpu_hw.c | 7 +- + drivers/staging/media/hantro/sama5d4_vdec_hw.c | 3 +- + drivers/staging/media/imx/imx-media-utils.c | 42 - + drivers/staging/media/imx/imx-media.h | 4 - + .../staging/media/ipu3/include/uapi/intel-ipu3.h | 10 +- + drivers/staging/media/ipu3/ipu3-css-params.c | 3 - + drivers/staging/media/max96712/Kconfig | 13 + + drivers/staging/media/max96712/Makefile | 2 + + drivers/staging/media/max96712/max96712.c | 440 +++ + drivers/staging/media/rkvdec/Kconfig | 1 + + drivers/staging/media/rkvdec/Makefile | 2 +- + drivers/staging/media/rkvdec/rkvdec-vp9.c | 1072 ++++++ + drivers/staging/media/rkvdec/rkvdec.c | 41 +- + drivers/staging/media/rkvdec/rkvdec.h | 12 +- + include/media/dvb_frontend.h | 13 +- + include/media/v4l2-ctrls.h | 4 + + include/media/v4l2-mem2mem.h | 5 + + include/media/v4l2-vp9.h | 233 ++ + include/uapi/linux/v4l2-controls.h | 288 +- + include/uapi/linux/videodev2.h | 6 + + 225 files changed, 10970 insertions(+), 9537 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/media/i2c/adv748x.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/adv748x.yaml + create mode 100644 Documentation/devicetree/bindings/media/st,stm32-dma2d.yaml + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d-hw.c + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d-regs.h + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d.c + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d.h + create mode 100644 drivers/media/v4l2-core/v4l2-vp9.c + delete mode 100644 drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_configs.c + delete mode 100644 drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_params.c + delete mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_configs.c + delete mode 100644 drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_states.c + create mode 100644 drivers/staging/media/atomisp/pci/ia_css_isp_configs.c + rename drivers/staging/media/atomisp/pci/{css_2401_system/hive => }/ia_css_isp_params.c (99%) + rename drivers/staging/media/atomisp/pci/{css_2400_system/hive => }/ia_css_isp_states.c (100%) + delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_metadata.c + delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_morph.c + delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_shading.c + delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_stream.c + create mode 100644 drivers/staging/media/hantro/hantro_g2.c + create mode 100644 drivers/staging/media/hantro/hantro_g2_vp9_dec.c + create mode 100644 drivers/staging/media/hantro/hantro_vp9.c + create mode 100644 drivers/staging/media/hantro/hantro_vp9.h + create mode 100644 drivers/staging/media/max96712/Kconfig + create mode 100644 drivers/staging/media/max96712/Makefile + create mode 100644 drivers/staging/media/max96712/max96712.c + create mode 100644 drivers/staging/media/rkvdec/rkvdec-vp9.c + create mode 100644 include/media/v4l2-vp9.h +Merging v4l-dvb-next/master (8cc7a1b2aca0 media: venus: core: Fix a resource leak in the error handling path of 'venus_probe()') +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging drivers/media/cec/core/cec-adap.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/renesas,jpu.txt +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + .../devicetree/bindings/media/renesas,jpu.txt | 25 - + .../devicetree/bindings/media/renesas,jpu.yaml | 65 + + .../userspace-api/media/v4l/dev-decoder.rst | 17 + + .../media/v4l/libv4l-introduction.rst | 2 +- + MAINTAINERS | 20 +- + drivers/media/cec/core/cec-adap.c | 8 +- + drivers/media/cec/core/cec-api.c | 2 +- + drivers/media/common/videobuf2/frame_vector.c | 15 +- + drivers/media/dvb-core/dvb_frontend.c | 13 +- + drivers/media/dvb-frontends/drxd_hard.c | 8 - + drivers/media/dvb-frontends/drxk_hard.c | 23 +- + drivers/media/dvb-frontends/m88ds3103.c | 6 +- + drivers/media/dvb-frontends/si21xx.c | 7 +- + drivers/media/dvb-frontends/stb6100.c | 2 +- + drivers/media/i2c/Kconfig | 12 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/adv7511-v4l2.c | 22 - + drivers/media/i2c/adv7604.c | 18 +- + drivers/media/i2c/adv7842.c | 10 - + drivers/media/i2c/cx25840/cx25840-ir.c | 20 - + drivers/media/i2c/imx274.c | 102 +- + drivers/media/i2c/imx290.c | 2 +- + drivers/media/i2c/ov5693.c | 1537 ++++++++++++++++++++ + drivers/media/i2c/ov8865.c | 466 ++++-- + drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 6 - + drivers/media/mc/mc-entity.c | 16 - + drivers/media/pci/cobalt/cobalt-cpld.c | 5 +- + drivers/media/pci/intel/ipu3/cio2-bridge.c | 4 +- + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 17 +- + drivers/media/pci/saa7134/saa7134-go7007.c | 7 +- + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 12 +- + drivers/media/platform/coda/coda-common.c | 8 +- + drivers/media/platform/coda/coda-jpeg.c | 21 +- + drivers/media/platform/davinci/vpbe_osd.c | 2 +- + drivers/media/platform/davinci/vpif_capture.c | 11 - + drivers/media/platform/imx-pxp.c | 35 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 7 - + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +- + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 2 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 5 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 188 +-- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 5 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.c | 10 - + .../media/platform/mtk-vcodec/mtk_vcodec_util.h | 45 +- + .../platform/mtk-vcodec/vdec/vdec_h264_req_if.c | 4 +- + drivers/media/platform/omap3isp/isp.c | 3 +- + drivers/media/platform/omap3isp/isph3a_af.c | 2 +- + drivers/media/platform/omap3isp/omap3isp.h | 2 + + drivers/media/platform/qcom/camss/camss-vfe-170.c | 7 - + drivers/media/platform/qcom/venus/core.c | 11 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 32 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 22 +- + drivers/media/platform/rcar_fdp1.c | 7 +- + drivers/media/platform/s3c-camif/camif-core.c | 2 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 1 + + drivers/media/platform/sti/hva/hva-hw.c | 4 +- + drivers/media/radio/radio-si476x.c | 6 - + drivers/media/radio/si470x/radio-si470x-i2c.c | 20 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 16 +- + drivers/media/tuners/mxl5005s.c | 14 +- + drivers/media/usb/au0828/au0828-i2c.c | 7 - + drivers/media/usb/dvb-usb-v2/lmedm04.c | 3 + + drivers/media/usb/pvrusb2/pvrusb2-encoder.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 33 +- + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 7 +- + drivers/staging/media/hantro/hantro_hw.h | 3 +- + drivers/staging/media/hantro/hantro_jpeg.c | 31 +- + drivers/staging/media/hantro/hantro_jpeg.h | 4 +- + .../media/hantro/rockchip_vpu2_hw_jpeg_enc.c | 22 +- + drivers/staging/media/hantro/rockchip_vpu_hw.c | 5 +- + drivers/staging/media/imx/imx-media-csc-scaler.c | 2 +- + drivers/staging/media/imx/imx-media-csi.c | 2 +- + drivers/staging/media/rkvdec/rkvdec.c | 2 +- + drivers/staging/media/tegra-vde/vde.c | 147 +- + drivers/staging/media/tegra-vde/vde.h | 18 + + 76 files changed, 2572 insertions(+), 685 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/media/renesas,jpu.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,jpu.yaml + create mode 100644 drivers/media/i2c/ov5693.c +Merging pm/linux-next (ece4fd2617f3 Merge branch 'acpi-ec' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging drivers/pci/quirks.c +Merge made by the 'recursive' strategy. + drivers/acpi/bus.c | 4 +- + drivers/acpi/dptf/dptf_pch_fivr.c | 2 +- + drivers/acpi/ec.c | 317 ++++++++++++--------- + drivers/acpi/ec_sys.c | 2 +- + drivers/acpi/internal.h | 12 +- + drivers/acpi/power.c | 12 + + drivers/acpi/processor_idle.c | 6 +- + drivers/acpi/scan.c | 10 +- + drivers/acpi/thermal.c | 2 - + drivers/acpi/x86/utils.c | 122 +++++--- + drivers/base/core.c | 1 - + drivers/base/property.c | 48 ---- + drivers/cpuidle/governors/menu.c | 2 +- + drivers/mmc/host/sdhci-acpi.c | 78 +---- + drivers/pci/quirks.c | 2 +- + .../intel/int340x_thermal/acpi_thermal_rel.c | 5 +- + .../intel/int340x_thermal/acpi_thermal_rel.h | 48 ++-- + include/acpi/acpi_bus.h | 5 +- + include/acpi/acpi_numa.h | 1 - + include/acpi/processor.h | 7 +- + include/linux/property.h | 4 - + tools/thermal/tmon/pid.c | 3 +- + 22 files changed, 350 insertions(+), 343 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (8f5783ad9eb8 cpufreq: qcom-hw: Use optional irq API) +$ 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 init/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/include/asm/topology.h | 2 +- + arch/arm64/include/asm/topology.h | 2 +- + drivers/base/arch_topology.c | 42 +++++++++++++++++++++++++++++++++++---- + drivers/cpufreq/qcom-cpufreq-hw.c | 39 ++++++++++++++++++------------------ + drivers/thermal/cpufreq_cooling.c | 6 +----- + include/linux/arch_topology.h | 4 ++-- + include/linux/sched/topology.h | 6 +++--- + init/Kconfig | 2 +- + 8 files changed, 66 insertions(+), 37 deletions(-) +Merging cpupower/cpupower (79a0dc5530a9 tools: cpupower: fix typo in cpupower-idle-set(1) manpage) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/man/cpupower-idle-set.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devfreq/devfreq-next (5cf79c293821 PM / devfreq: Strengthen check for freq_table) +$ 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 (7ca81b690e59 dt-bindings: opp: Allow multi-worded OPP entry name) +$ 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 (673c68bd4839 thermal/drivers: Add TSU driver for RZ/G2L) +$ 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 +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/rzg2l-thermal.yaml | 76 +++++++ + drivers/thermal/Kconfig | 9 + + drivers/thermal/Makefile | 1 + + drivers/thermal/imx_thermal.c | 145 ++++++++----- + drivers/thermal/intel/intel_powerclamp.c | 2 +- + drivers/thermal/rzg2l_thermal.c | 240 +++++++++++++++++++++ + 6 files changed, 418 insertions(+), 55 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/rzg2l-thermal.yaml + create mode 100644 drivers/thermal/rzg2l_thermal.c +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 (1b9beda83e27 fs: dlm: fix build with CONFIG_IPV6 disabled) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/ast.c | 12 ++- + fs/dlm/debug_fs.c | 96 ++++++++++++++++- + fs/dlm/dir.c | 3 +- + fs/dlm/dlm_internal.h | 11 +- + fs/dlm/lock.c | 90 +++++++++++++++- + fs/dlm/lock.h | 4 + + fs/dlm/lockspace.c | 37 ++++--- + fs/dlm/lowcomms.c | 97 ++++++++--------- + fs/dlm/lowcomms.h | 4 +- + fs/dlm/main.c | 3 + + fs/dlm/member.c | 3 +- + fs/dlm/midcomms.c | 64 +++++++++-- + fs/dlm/midcomms.h | 2 + + fs/dlm/rcom.c | 2 +- + fs/dlm/recoverd.c | 3 +- + fs/dlm/requestqueue.c | 17 ++- + include/trace/events/dlm.h | 260 +++++++++++++++++++++++++++++++++++++++++++++ + 17 files changed, 601 insertions(+), 107 deletions(-) + create mode 100644 include/trace/events/dlm.h +Merging rdma/for-next (81ff48ddda0b RDMA/bnxt_re: Use bitmap_zalloc() when applicable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/sw/rxe/rxe_qp.c +Auto-merging drivers/infiniband/hw/mlx4/main.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cma.c | 6 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 9 +- + drivers/infiniband/hw/bnxt_re/main.c | 3 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 11 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 12 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 1 - + drivers/infiniband/hw/bnxt_re/qplib_res.c | 50 ------ + drivers/infiniband/hw/bnxt_re/qplib_res.h | 7 - + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 99 +----------- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 9 -- + drivers/infiniband/hw/cxgb4/id_table.c | 17 +- + drivers/infiniband/hw/cxgb4/provider.c | 8 +- + drivers/infiniband/hw/hfi1/user_sdma.c | 8 +- + drivers/infiniband/hw/hns/hns_roce_cmd.c | 10 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 40 ++--- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 17 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 18 +-- + drivers/infiniband/hw/hns/hns_roce_main.c | 3 + + drivers/infiniband/hw/hns/hns_roce_mr.c | 10 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 2 +- + drivers/infiniband/hw/irdma/verbs.c | 27 +--- + drivers/infiniband/hw/mlx4/main.c | 10 +- + drivers/infiniband/hw/mthca/mthca_allocator.c | 15 +- + drivers/infiniband/hw/mthca/mthca_mr.c | 22 ++- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 16 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 17 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 10 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 1 - + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 8 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_doorbell.c | 10 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 8 +- + drivers/infiniband/sw/rxe/rxe_cq.c | 24 ++- + drivers/infiniband/sw/rxe/rxe_loc.h | 10 +- + drivers/infiniband/sw/rxe/rxe_mcast.c | 11 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 6 +- + drivers/infiniband/sw/rxe/rxe_mw.c | 21 ++- + drivers/infiniband/sw/rxe/rxe_pool.c | 177 ++++++++++----------- + drivers/infiniband/sw/rxe/rxe_pool.h | 54 +++---- + drivers/infiniband/sw/rxe/rxe_qp.c | 6 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 9 +- + drivers/infiniband/sw/rxe/rxe_req.c | 11 +- + drivers/infiniband/sw/rxe/rxe_srq.c | 2 +- + drivers/infiniband/sw/rxe/rxe_task.c | 18 +-- + drivers/infiniband/sw/rxe/rxe_verbs.c | 29 ++-- + drivers/infiniband/sw/rxe/rxe_verbs.h | 22 +-- + drivers/infiniband/sw/siw/siw_verbs.c | 4 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2 +- + 47 files changed, 315 insertions(+), 575 deletions(-) +Merging net-next/master (ce83278f313c Merge branch 'qed-enhancements') +$ 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 tools/testing/selftests/net/fcnal-test.sh +Removing tools/testing/selftests/bpf/test_stub.c +Auto-merging net/ipv4/inet_connection_sock.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/btf.c +Auto-merging include/linux/filter.h +Auto-merging include/linux/bpf.h +Auto-merging drivers/net/ethernet/qlogic/qede/qede_fp.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/bpf/btf.rst | 13 +- + .../intel,ixp4xx-network-processing-engine.yaml | 35 + + .../devicetree/bindings/net/dsa/dsa-port.yaml | 77 + + Documentation/devicetree/bindings/net/dsa/dsa.yaml | 60 +- + .../devicetree/bindings/net/dsa/qca8k.yaml | 40 +- + .../devicetree/bindings/net/engleder,tsnep.yaml | 79 + + .../devicetree/bindings/net/intel,ixp4xx-hss.yaml | 100 + + .../bindings/net/microchip,lan966x-switch.yaml | 167 + + .../devicetree/bindings/net/qcom,bam-dmux.yaml | 92 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/networking/bonding.rst | 11 + + .../networking/devlink/devlink-params.rst | 3 + + Documentation/networking/ethtool-netlink.rst | 10 +- + Documentation/networking/net_failover.rst | 111 +- + Documentation/networking/phy.rst | 5 + + MAINTAINERS | 15 + + arch/arm64/include/asm/extable.h | 9 - + arch/arm64/include/asm/memory.h | 5 +- + arch/arm64/kernel/traps.c | 2 +- + arch/arm64/mm/ptdump.c | 2 - + arch/arm64/net/bpf_jit_comp.c | 7 +- + arch/um/drivers/vector_kern.c | 4 +- + drivers/base/regmap/regmap.c | 1 + + drivers/bluetooth/Kconfig | 6 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/bfusb.c | 3 + + drivers/bluetooth/btintel.c | 22 +- + drivers/bluetooth/btmrvl_main.c | 2 +- + drivers/bluetooth/btmtk.c | 289 ++ + drivers/bluetooth/btmtk.h | 111 + + drivers/bluetooth/btmtksdio.c | 496 +- + drivers/bluetooth/btsdio.c | 2 + + drivers/bluetooth/btusb.c | 390 +- + drivers/bluetooth/hci_bcm.c | 1 - + drivers/bluetooth/hci_h4.c | 4 +- + drivers/bluetooth/hci_vhci.c | 120 +- + drivers/bluetooth/virtio_bt.c | 3 + + drivers/infiniband/hw/irdma/main.c | 3 +- + drivers/net/bonding/bond_main.c | 74 +- + drivers/net/bonding/bond_netlink.c | 15 + + drivers/net/bonding/bond_options.c | 28 + + drivers/net/bonding/bond_procfs.c | 2 + + drivers/net/bonding/bond_sysfs.c | 13 + + drivers/net/can/c_can/c_can_ethtool.c | 4 +- + drivers/net/dsa/hirschmann/hellcreek.c | 24 +- + drivers/net/dsa/lantiq_gswip.c | 120 +- + drivers/net/dsa/ocelot/Kconfig | 1 + + drivers/net/dsa/ocelot/felix.c | 16 +- + drivers/net/dsa/ocelot/felix.h | 4 + + drivers/net/dsa/ocelot/felix_vsc9959.c | 893 +++- + drivers/net/dsa/ocelot/seville_vsc9953.c | 111 +- + drivers/net/dsa/qca8k.c | 653 ++- + drivers/net/dsa/qca8k.h | 198 +- + drivers/net/dsa/realtek-smi-core.c | 2 +- + drivers/net/dsa/rtl8365mb.c | 17 +- + drivers/net/dsa/vitesse-vsc73xx-core.c | 7 +- + drivers/net/dsa/vitesse-vsc73xx.h | 2 +- + drivers/net/ethernet/3com/typhoon.c | 4 +- + drivers/net/ethernet/8390/hydra.c | 4 +- + drivers/net/ethernet/8390/mac8390.c | 4 +- + drivers/net/ethernet/8390/smc-ultra.c | 4 +- + drivers/net/ethernet/8390/wd.c | 4 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 8 +- + drivers/net/ethernet/amd/a2065.c | 18 +- + drivers/net/ethernet/amd/ariadne.c | 20 +- + drivers/net/ethernet/amd/atarilance.c | 7 +- + drivers/net/ethernet/amd/hplance.c | 4 +- + drivers/net/ethernet/amd/lance.c | 4 +- + drivers/net/ethernet/amd/mvme147.c | 14 +- + drivers/net/ethernet/amd/ni65.c | 8 +- + drivers/net/ethernet/amd/pcnet32.c | 8 +- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 11 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- + drivers/net/ethernet/apple/macmace.c | 14 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 8 +- + drivers/net/ethernet/asix/ax88796c_main.c | 18 +- + drivers/net/ethernet/atheros/ag71xx.c | 98 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 8 +- + drivers/net/ethernet/broadcom/b44.c | 8 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 25 +- + drivers/net/ethernet/broadcom/bnx2.c | 8 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 1 + + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 8 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 7 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 14 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 8 +- + drivers/net/ethernet/broadcom/tg3.c | 10 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 8 +- + drivers/net/ethernet/cadence/macb_main.c | 107 +- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 11 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 8 +- + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 8 +- + drivers/net/ethernet/chelsio/cxgb/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 8 +- + drivers/net/ethernet/chelsio/cxgb3/sge.c | 13 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 19 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 8 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 10 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 8 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 7 +- + drivers/net/ethernet/cirrus/mac89x0.c | 7 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 8 +- + drivers/net/ethernet/cortina/gemini.c | 8 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 4 +- + drivers/net/ethernet/engleder/Kconfig | 38 + + drivers/net/ethernet/engleder/Makefile | 10 + + drivers/net/ethernet/engleder/tsnep.h | 189 + + drivers/net/ethernet/engleder/tsnep_ethtool.c | 293 ++ + drivers/net/ethernet/engleder/tsnep_hw.h | 230 + + drivers/net/ethernet/engleder/tsnep_main.c | 1272 +++++ + drivers/net/ethernet/engleder/tsnep_ptp.c | 221 + + drivers/net/ethernet/engleder/tsnep_selftests.c | 811 ++++ + drivers/net/ethernet/engleder/tsnep_tc.c | 443 ++ + drivers/net/ethernet/ethoc.c | 8 +- + drivers/net/ethernet/faraday/ftgmac100.c | 14 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 109 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 4 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 53 +- + drivers/net/ethernet/freescale/fec_main.c | 2 +- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 8 +- + drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 8 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 4 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 6 +- + drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 3 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 14 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h | 2 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 904 ++-- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 17 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 116 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 106 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h | 13 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c | 2 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 618 ++- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 7 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 10 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h | 4 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h | 3 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 108 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 6 + + .../hisilicon/hns3/hns3vf/hclgevf_devlink.c | 2 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 39 +- + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 40 +- + drivers/net/ethernet/i825xx/82596.c | 3 +- + drivers/net/ethernet/i825xx/lasi_82596.c | 6 +- + drivers/net/ethernet/ibm/emac/core.c | 7 +- + drivers/net/ethernet/ibm/ibmvnic.c | 10 +- + drivers/net/ethernet/intel/e100.c | 8 +- + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 8 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 8 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 8 +- + drivers/net/ethernet/intel/iavf/iavf.h | 10 +- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 60 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 29 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 24 +- + drivers/net/ethernet/intel/ice/ice.h | 1 + + drivers/net/ethernet/intel/ice/ice_devlink.c | 144 + + drivers/net/ethernet/intel/ice/ice_devlink.h | 2 + + drivers/net/ethernet/intel/ice/ice_ethtool.c | 8 +- + drivers/net/ethernet/intel/ice/ice_idc.c | 4 +- + drivers/net/ethernet/intel/ice/ice_main.c | 9 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 8 +- + drivers/net/ethernet/intel/igb/igb_main.c | 4 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 8 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 14 +- + drivers/net/ethernet/intel/igc/igc_main.c | 37 +- + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 8 +- + drivers/net/ethernet/intel/ixgbevf/defines.h | 4 + + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 8 +- + drivers/net/ethernet/intel/ixgbevf/ipsec.c | 11 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 5 + + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 11 +- + drivers/net/ethernet/intel/ixgbevf/mbx.c | 323 +- + drivers/net/ethernet/intel/ixgbevf/mbx.h | 19 +- + drivers/net/ethernet/intel/ixgbevf/vf.c | 62 +- + drivers/net/ethernet/intel/ixgbevf/vf.h | 5 +- + drivers/net/ethernet/lantiq_etop.c | 4 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 10 +- + drivers/net/ethernet/marvell/mvneta.c | 218 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 114 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 8 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +- + drivers/net/ethernet/marvell/prestera/Makefile | 2 +- + drivers/net/ethernet/marvell/prestera/prestera.h | 1 + + .../net/ethernet/marvell/prestera/prestera_acl.c | 675 ++- + .../net/ethernet/marvell/prestera/prestera_acl.h | 213 +- + .../ethernet/marvell/prestera/prestera_counter.c | 475 ++ + .../ethernet/marvell/prestera/prestera_counter.h | 30 + + .../net/ethernet/marvell/prestera/prestera_flow.c | 101 +- + .../net/ethernet/marvell/prestera/prestera_flow.h | 16 + + .../ethernet/marvell/prestera/prestera_flower.c | 283 +- + .../ethernet/marvell/prestera/prestera_flower.h | 3 +- + .../net/ethernet/marvell/prestera/prestera_hw.c | 491 +- + .../net/ethernet/marvell/prestera/prestera_hw.h | 62 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 8 + + .../net/ethernet/marvell/prestera/prestera_span.c | 1 + + drivers/net/ethernet/marvell/skge.c | 8 +- + drivers/net/ethernet/marvell/sky2.c | 92 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 111 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 10 +- + .../net/ethernet/mellanox/mlx5/core/en/mod_hdr.c | 58 + + .../net/ethernet/mellanox/mlx5/core/en/mod_hdr.h | 26 + + .../net/ethernet/mellanox/mlx5/core/en/params.c | 2 +- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 39 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 23 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 3 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 57 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 285 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 5 - + .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/esw/legacy.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 221 +- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 94 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 11 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 59 + + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 74 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 5 + + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 12 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 51 +- + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/sf/hw_table.c | 2 +- + .../mellanox/mlxbf_gige/mlxbf_gige_ethtool.c | 7 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 50 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 44 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 22 +- + .../mellanox/mlxsw/core_acl_flex_actions.h | 16 +- + drivers/net/ethernet/mellanox/mlxsw/item.h | 36 + + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 10 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 1 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 487 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 66 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 20 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 2 +- + .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 14 +- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 58 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 30 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 12 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h | 16 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 5 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 20 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 60 +- + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 24 +- + drivers/net/ethernet/micrel/ksz884x.c | 6 +- + drivers/net/ethernet/microchip/Kconfig | 1 + + drivers/net/ethernet/microchip/Makefile | 1 + + drivers/net/ethernet/microchip/lan966x/Kconfig | 8 + + drivers/net/ethernet/microchip/lan966x/Makefile | 9 + + .../ethernet/microchip/lan966x/lan966x_ethtool.c | 682 +++ + .../net/ethernet/microchip/lan966x/lan966x_ifh.h | 173 + + .../net/ethernet/microchip/lan966x/lan966x_mac.c | 101 + + .../net/ethernet/microchip/lan966x/lan966x_main.c | 941 ++++ + .../net/ethernet/microchip/lan966x/lan966x_main.h | 192 + + .../ethernet/microchip/lan966x/lan966x_phylink.c | 127 + + .../net/ethernet/microchip/lan966x/lan966x_port.c | 412 ++ + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 730 +++ + .../net/ethernet/microchip/sparx5/sparx5_main.c | 27 + + .../net/ethernet/microchip/sparx5/sparx5_phylink.c | 75 +- + drivers/net/ethernet/microsoft/mana/Makefile | 2 +- + drivers/net/ethernet/microsoft/mana/mana.h | 13 + + drivers/net/ethernet/microsoft/mana/mana_bpf.c | 162 + + drivers/net/ethernet/microsoft/mana/mana_en.c | 69 +- + drivers/net/ethernet/mscc/ocelot.c | 173 +- + drivers/net/ethernet/mscc/ocelot.h | 13 - + drivers/net/ethernet/mscc/ocelot_flower.c | 84 +- + drivers/net/ethernet/mscc/ocelot_net.c | 41 +- + drivers/net/ethernet/mscc/ocelot_vcap.c | 103 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 7 + + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 4 +- + drivers/net/ethernet/natsemi/jazzsonic.c | 6 +- + drivers/net/ethernet/natsemi/macsonic.c | 27 +- + drivers/net/ethernet/natsemi/xtsonic.c | 6 +- + drivers/net/ethernet/neterion/s2io.c | 7 +- + .../net/ethernet/netronome/nfp/flower/metadata.c | 20 - + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 8 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 6 +- + drivers/net/ethernet/nvidia/forcedeth.c | 10 +- + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 12 +- + drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c | 4 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 8 +- + .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 8 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 24 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 19 + + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 102 + + drivers/net/ethernet/qlogic/qed/qed_int.c | 22 + + drivers/net/ethernet/qlogic/qed/qed_int.h | 13 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 72 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 22 + + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 22 + + drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h | 1 + + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 2 + + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 10 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 42 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 21 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 1 + + drivers/net/ethernet/qlogic/qede/qede_main.c | 91 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 8 +- + drivers/net/ethernet/qualcomm/emac/emac-ethtool.c | 8 +- + drivers/net/ethernet/qualcomm/qca_debug.c | 8 +- + drivers/net/ethernet/realtek/8139cp.c | 4 +- + drivers/net/ethernet/realtek/r8169_main.c | 53 +- + drivers/net/ethernet/renesas/ravb_main.c | 14 +- + drivers/net/ethernet/renesas/sh_eth.c | 8 +- + drivers/net/ethernet/rocker/rocker_main.c | 12 - + drivers/net/ethernet/sfc/ef100_ethtool.c | 7 +- + drivers/net/ethernet/sfc/ef100_nic.c | 6 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/ethtool.c | 14 +- + drivers/net/ethernet/sfc/falcon/efx.c | 2 +- + drivers/net/ethernet/sfc/falcon/ethtool.c | 14 +- + drivers/net/ethernet/smsc/smc9194.c | 6 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 33 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 5 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 159 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 5 + + drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c | 4 +- + drivers/net/ethernet/tehuti/tehuti.c | 12 +- + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 7 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- + drivers/net/ethernet/ti/cpmac.c | 8 +- + drivers/net/ethernet/ti/cpsw_ethtool.c | 8 +- + drivers/net/ethernet/ti/cpsw_priv.c | 22 +- + drivers/net/ethernet/ti/cpsw_priv.h | 8 +- + drivers/net/ethernet/toshiba/spider_net.c | 12 +- + drivers/net/ethernet/toshiba/spider_net_ethtool.c | 4 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 14 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 85 +- + drivers/net/fddi/skfp/smt.c | 14 +- + drivers/net/geneve.c | 9 +- + drivers/net/hyperv/netvsc.c | 10 +- + drivers/net/hyperv/netvsc_drv.c | 8 +- + drivers/net/ifb.c | 146 +- + drivers/net/ipa/gsi.c | 114 +- + drivers/net/ipa/gsi.h | 21 +- + drivers/net/ipa/gsi_reg.h | 4 + + drivers/net/ipa/ipa_endpoint.c | 93 +- + drivers/net/ipa/ipa_main.c | 6 +- + drivers/net/ipa/ipa_mem.c | 4 +- + drivers/net/ipa/ipa_modem.c | 10 - + drivers/net/ipa/ipa_modem.h | 3 - + drivers/net/ipa/ipa_table.c | 48 +- + drivers/net/ipvlan/ipvlan_core.c | 3 +- + drivers/net/ipvlan/ipvlan_main.c | 11 +- + drivers/net/macvlan.c | 11 +- + drivers/net/mctp/Kconfig | 18 + + drivers/net/mctp/Makefile | 1 + + drivers/net/mctp/mctp-serial.c | 515 ++ + drivers/net/mdio/Kconfig | 2 +- + drivers/net/mdio/mdio-ipq8064.c | 2 +- + drivers/net/mdio/mdio-mscc-miim.c | 176 +- + drivers/net/netdevsim/dev.c | 4 +- + drivers/net/netdevsim/ethtool.c | 8 +- + drivers/net/phy/dp83869.c | 42 +- + drivers/net/phy/mdio_bus.c | 16 +- + drivers/net/phy/phylink.c | 381 +- + drivers/net/usb/ax88179_178a.c | 17 +- + drivers/net/usb/lan78xx.c | 1214 +++-- + drivers/net/usb/r8152.c | 8 +- + drivers/net/veth.c | 31 +- + drivers/net/virtio_net.c | 6 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 10 +- + drivers/net/vxlan.c | 10 +- + drivers/net/wan/fsl_ucc_hdlc.c | 62 +- + drivers/net/wan/ixp4xx_hss.c | 261 +- + drivers/net/wireguard/queueing.h | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/marvell/mwifiex/init.c | 2 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 6 +- + drivers/net/wwan/Kconfig | 13 + + drivers/net/wwan/Makefile | 1 + + drivers/net/wwan/iosm/Makefile | 3 +- + drivers/net/wwan/iosm/iosm_ipc_imem.c | 13 + + drivers/net/wwan/iosm/iosm_ipc_imem.h | 2 + + drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 31 +- + drivers/net/wwan/iosm/iosm_ipc_imem_ops.h | 9 +- + drivers/net/wwan/iosm/iosm_ipc_port.c | 2 +- + drivers/net/wwan/iosm/iosm_ipc_trace.c | 173 + + drivers/net/wwan/iosm/iosm_ipc_trace.h | 51 + + drivers/net/wwan/qcom_bam_dmux.c | 907 ++++ + drivers/net/wwan/wwan_core.c | 30 +- + drivers/nfc/fdp/i2c.c | 4 +- + drivers/pcmcia/pcmcia_cis.c | 3 +- + drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 9 + + drivers/s390/net/ctcm_dbug.h | 1 + + drivers/s390/net/ctcm_fsms.c | 2 +- + drivers/s390/net/lcs.c | 11 +- + drivers/s390/net/qeth_core_main.c | 35 +- + drivers/s390/net/qeth_ethtool.c | 4 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- + include/asm-generic/sections.h | 14 +- + include/linux/bpf.h | 1 + + include/linux/btf_ids.h | 20 +- + include/linux/ethtool.h | 26 +- + include/linux/filter.h | 7 +- + include/linux/mdio/mdio-mscc-miim.h | 19 + + include/linux/mlx5/driver.h | 4 + + include/linux/mmc/sdio_ids.h | 1 + + include/linux/net/intel/iidc.h | 7 +- + include/linux/netdevice.h | 451 +- + include/linux/once.h | 2 +- + include/linux/phy.h | 2 +- + include/linux/phylink.h | 38 +- + include/linux/qed/qed_if.h | 14 + + include/linux/regmap.h | 7 + + include/linux/siphash.h | 2 + + include/linux/skbuff.h | 55 +- + include/linux/skmsg.h | 6 - + include/linux/stmmac.h | 2 + + include/linux/wwan.h | 2 + + include/net/af_unix.h | 3 +- + include/net/arp.h | 8 +- + include/net/bluetooth/bluetooth.h | 2 + + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 27 +- + include/net/bluetooth/hci_sync.h | 102 + + include/net/bond_options.h | 1 + + include/net/bonding.h | 1 + + include/net/devlink.h | 34 +- + include/net/dsa.h | 4 +- + include/net/gro.h | 421 +- + include/net/inet_connection_sock.h | 2 +- + include/net/inet_sock.h | 12 + + include/net/ip.h | 9 +- + include/net/ip6_checksum.h | 20 +- + include/net/ip6_route.h | 18 +- + include/net/ipv6.h | 2 +- + include/net/iucv/af_iucv.h | 10 +- + include/net/ndisc.h | 16 +- + include/net/neighbour.h | 11 + + include/net/netns/core.h | 1 - + include/net/sctp/structs.h | 7 +- + include/net/sock.h | 84 +- + include/net/tcp.h | 18 +- + include/net/udp.h | 24 - + include/net/vxlan.h | 1 + + include/soc/mscc/ocelot.h | 59 +- + include/soc/mscc/ocelot_ana.h | 10 + + include/soc/mscc/ocelot_vcap.h | 1 + + include/uapi/linux/bpf.h | 21 + + include/uapi/linux/btf.h | 3 +- + include/uapi/linux/ethtool.h | 1 + + include/uapi/linux/ethtool_netlink.h | 1 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/tty.h | 1 + + kernel/bpf/bpf_task_storage.c | 4 +- + kernel/bpf/btf.c | 19 +- + kernel/bpf/mmap_unlock_work.h | 65 + + kernel/bpf/stackmap.c | 82 +- + kernel/bpf/task_iter.c | 82 +- + kernel/bpf/verifier.c | 34 + + kernel/trace/bpf_trace.c | 6 +- + net/802/hippi.c | 2 +- + net/8021q/vlan.c | 4 +- + net/8021q/vlan_core.c | 7 +- + net/8021q/vlan_dev.c | 4 +- + net/8021q/vlanproc.c | 2 +- + net/Kconfig | 5 + + net/bluetooth/Makefile | 2 +- + net/bluetooth/aosp.c | 168 +- + net/bluetooth/aosp.h | 13 + + net/bluetooth/cmtp/core.c | 4 +- + net/bluetooth/hci_codec.c | 18 +- + net/bluetooth/hci_conn.c | 20 +- + net/bluetooth/hci_core.c | 1334 +----- + net/bluetooth/hci_event.c | 211 +- + net/bluetooth/hci_request.c | 500 +- + net/bluetooth/hci_request.h | 15 +- + net/bluetooth/hci_sock.c | 11 +- + net/bluetooth/hci_sync.c | 4922 ++++++++++++++++++++ + net/bluetooth/hci_sysfs.c | 2 + + net/bluetooth/l2cap_sock.c | 19 + + net/bluetooth/mgmt.c | 2155 +++++---- + net/bluetooth/mgmt_util.c | 15 +- + net/bluetooth/mgmt_util.h | 4 + + net/bluetooth/msft.c | 511 +- + net/bluetooth/msft.h | 15 +- + net/bridge/br_if.c | 12 +- + net/bridge/br_sysfs_br.c | 7 +- + net/bridge/br_vlan.c | 4 +- + net/core/Makefile | 4 +- + net/core/dev.c | 713 +-- + net/core/dev_addr_lists.c | 93 +- + net/core/dev_addr_lists_test.c | 236 + + net/core/devlink.c | 70 +- + net/core/filter.c | 23 +- + net/core/flow_dissector.c | 2 +- + net/core/gro.c | 766 +++ + net/core/link_watch.c | 4 +- + net/core/net-sysfs.c | 16 +- + net/core/rtnetlink.c | 15 +- + net/core/secure_seq.c | 4 +- + net/core/skbuff.c | 162 +- + net/core/sock.c | 61 +- + net/dccp/proto.c | 27 +- + net/dccp/trace.h | 4 +- + net/dsa/dsa.c | 2 +- + net/dsa/dsa_priv.h | 2 +- + net/dsa/port.c | 48 +- + net/dsa/slave.c | 19 +- + net/ethernet/eth.c | 7 +- + net/ethtool/common.c | 1 + + net/ethtool/features.c | 1 - + net/ethtool/ioctl.c | 14 +- + net/ethtool/netlink.h | 2 +- + net/ethtool/rings.c | 32 +- + net/ethtool/stats.c | 15 +- + net/hsr/hsr_device.c | 6 +- + net/ieee802154/socket.c | 4 +- + net/ipv4/af_inet.c | 29 +- + net/ipv4/arp.c | 33 +- + net/ipv4/esp4_offload.c | 1 + + net/ipv4/fou.c | 26 +- + net/ipv4/gre_offload.c | 13 +- + net/ipv4/igmp.c | 1 - + net/ipv4/inet_connection_sock.c | 2 +- + net/ipv4/inet_hashtables.c | 8 +- + net/ipv4/ip_output.c | 1 - + net/ipv4/ip_sockglue.c | 2 +- + net/ipv4/nexthop.c | 8 +- + net/ipv4/ping.c | 14 +- + net/ipv4/raw.c | 15 +- + net/ipv4/route.c | 2 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/tcp.c | 91 +- + net/ipv4/tcp_input.c | 8 +- + net/ipv4/tcp_ipv4.c | 10 +- + net/ipv4/tcp_offload.c | 1 + + net/ipv4/tcp_output.c | 2 +- + net/ipv4/udp.c | 10 +- + net/ipv4/udp_offload.c | 32 +- + net/ipv6/af_inet6.c | 7 +- + net/ipv6/ah6.c | 5 +- + net/ipv6/esp6_offload.c | 1 + + net/ipv6/exthdrs.c | 1 - + net/ipv6/inet6_hashtables.c | 8 +- + net/ipv6/ip6_offload.c | 14 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ipv6_sockglue.c | 17 +- + net/ipv6/route.c | 26 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/tcp_ipv6.c | 10 +- + net/ipv6/tcpv6_offload.c | 1 + + net/ipv6/udp.c | 8 +- + net/ipv6/udp_offload.c | 3 +- + net/iucv/af_iucv.c | 40 +- + net/iucv/iucv.c | 124 +- + net/l2tp/l2tp_core.c | 52 +- + net/l2tp/l2tp_core.h | 2 +- + net/l2tp/l2tp_debugfs.c | 13 +- + net/mac80211/ethtool.c | 8 +- + net/mctp/af_mctp.c | 3 +- + net/mctp/route.c | 7 +- + net/mctp/test/route-test.c | 5 - + net/mpls/af_mpls.c | 8 +- + net/mpls/internal.h | 13 +- + net/mptcp/protocol.c | 2 +- + net/mptcp/sockopt.c | 106 +- + net/mptcp/subflow.c | 7 +- + net/netfilter/nf_conntrack_core.c | 4 +- + net/netfilter/nf_conntrack_expect.c | 2 +- + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/netfilter/nf_nat_core.c | 2 +- + net/netlink/af_netlink.c | 4 - + net/openvswitch/vport-netdev.c | 3 +- + net/packet/af_packet.c | 4 - + net/rds/send.c | 2 +- + net/sched/act_ct.c | 3 +- + net/sched/sch_generic.c | 69 +- + net/sched/sch_netem.c | 18 +- + net/sctp/output.c | 2 +- + net/sctp/outqueue.c | 3 + + net/sctp/sm_statefuns.c | 11 +- + net/sctp/socket.c | 5 - + net/sctp/transport.c | 26 +- + net/smc/af_smc.c | 2 +- + net/tipc/crypto.c | 19 +- + net/tls/tls_sw.c | 36 +- + net/unix/af_unix.c | 571 ++- + net/unix/diag.c | 23 +- + net/xdp/xsk.c | 4 - + tools/bpf/bpftool/.gitignore | 2 +- + tools/bpf/bpftool/Documentation/Makefile | 3 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 2 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 12 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 2 +- + tools/bpf/bpftool/Documentation/bpftool-link.rst | 2 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 8 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 66 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 8 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 6 +- + tools/bpf/bpftool/Documentation/common_options.rst | 9 + + tools/bpf/bpftool/Makefile | 19 +- + tools/bpf/bpftool/bash-completion/bpftool | 5 +- + tools/bpf/bpftool/btf.c | 13 +- + tools/bpf/bpftool/btf_dumper.c | 42 +- + tools/bpf/bpftool/common.c | 1 + + tools/bpf/bpftool/feature.c | 2 +- + tools/bpf/bpftool/gen.c | 12 +- + tools/bpf/bpftool/iter.c | 7 +- + tools/bpf/bpftool/main.c | 13 +- + tools/bpf/bpftool/main.h | 3 +- + tools/bpf/bpftool/map.c | 13 +- + tools/bpf/bpftool/map_perf_ring.c | 9 +- + tools/bpf/bpftool/prog.c | 214 +- + tools/bpf/bpftool/struct_ops.c | 16 +- + tools/bpf/runqslower/runqslower.c | 6 +- + tools/include/uapi/linux/bpf.h | 21 + + tools/include/uapi/linux/btf.h | 3 +- + tools/include/uapi/linux/if_link.h | 1 + + tools/lib/bpf/Makefile | 1 + + tools/lib/bpf/bpf.c | 166 +- + tools/lib/bpf/bpf.h | 74 +- + tools/lib/bpf/bpf_gen_internal.h | 8 +- + tools/lib/bpf/btf.c | 69 +- + tools/lib/bpf/btf.h | 80 +- + tools/lib/bpf/btf_dump.c | 40 +- + tools/lib/bpf/gen_loader.c | 33 +- + tools/lib/bpf/libbpf.c | 376 +- + tools/lib/bpf/libbpf.h | 102 +- + tools/lib/bpf/libbpf.map | 13 + + tools/lib/bpf/libbpf_common.h | 14 +- + tools/lib/bpf/libbpf_internal.h | 33 +- + tools/lib/bpf/libbpf_legacy.h | 1 + + tools/lib/bpf/libbpf_probes.c | 20 +- + tools/lib/bpf/linker.c | 4 +- + tools/lib/bpf/xsk.c | 34 +- + tools/testing/selftests/bpf/Makefile | 71 +- + tools/testing/selftests/bpf/README.rst | 9 +- + .../selftests/bpf/benchs/bench_bloom_filter_map.c | 17 +- + .../testing/selftests/bpf/benchs/bench_ringbufs.c | 8 +- + tools/testing/selftests/bpf/btf_helpers.c | 17 +- + tools/testing/selftests/bpf/flow_dissector_load.h | 3 +- + tools/testing/selftests/bpf/get_cgroup_id_user.c | 5 +- + tools/testing/selftests/bpf/prog_tests/align.c | 11 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 8 +- + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 2 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 207 +- + .../selftests/bpf/prog_tests/btf_dedup_split.c | 6 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 41 +- + tools/testing/selftests/bpf/prog_tests/btf_split.c | 4 +- + tools/testing/selftests/bpf/prog_tests/btf_tag.c | 44 +- + tools/testing/selftests/bpf/prog_tests/btf_write.c | 67 +- + .../bpf/prog_tests/cgroup_attach_autodetach.c | 2 +- + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 2 +- + .../bpf/prog_tests/cgroup_attach_override.c | 2 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 2 +- + tools/testing/selftests/bpf/prog_tests/exhandler.c | 43 + + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 8 +- + .../selftests/bpf/prog_tests/fexit_stress.c | 33 +- + tools/testing/selftests/bpf/prog_tests/find_vma.c | 117 + + .../bpf/prog_tests/flow_dissector_load_bytes.c | 2 +- + .../bpf/prog_tests/flow_dissector_reattach.c | 4 +- + .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 9 +- + .../testing/selftests/bpf/prog_tests/global_data.c | 2 +- + .../selftests/bpf/prog_tests/global_func_args.c | 2 +- + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 8 +- + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 2 +- + .../selftests/bpf/prog_tests/load_bytes_relative.c | 2 +- + tools/testing/selftests/bpf/prog_tests/map_lock.c | 4 +- + .../selftests/bpf/prog_tests/migrate_reuseport.c | 4 +- + .../testing/selftests/bpf/prog_tests/perf_buffer.c | 6 +- + .../testing/selftests/bpf/prog_tests/pkt_access.c | 2 +- + .../selftests/bpf/prog_tests/pkt_md_access.c | 2 +- + .../selftests/bpf/prog_tests/queue_stack_map.c | 2 +- + .../raw_tp_writable_reject_nbd_invalid.c | 14 +- + .../bpf/prog_tests/raw_tp_writable_test_run.c | 29 +- + .../selftests/bpf/prog_tests/signal_pending.c | 2 +- + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 31 + + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 4 +- + .../testing/selftests/bpf/prog_tests/skb_helpers.c | 2 +- + tools/testing/selftests/bpf/prog_tests/sockopt.c | 19 +- + tools/testing/selftests/bpf/prog_tests/spinlock.c | 4 +- + .../selftests/bpf/prog_tests/stacktrace_map.c | 2 +- + .../bpf/prog_tests/stacktrace_map_raw_tp.c | 2 +- + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 18 +- + .../selftests/bpf/prog_tests/task_fd_query_rawtp.c | 2 +- + .../selftests/bpf/prog_tests/task_fd_query_tp.c | 4 +- + .../testing/selftests/bpf/prog_tests/tcp_estats.c | 2 +- + .../selftests/bpf/prog_tests/tp_attach_query.c | 2 +- + tools/testing/selftests/bpf/prog_tests/xdp.c | 2 +- + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 6 +- + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 6 +- + .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 7 +- + tools/testing/selftests/bpf/prog_tests/xdp_info.c | 2 +- + tools/testing/selftests/bpf/prog_tests/xdp_perf.c | 2 +- + tools/testing/selftests/bpf/progs/bpf_iter_unix.c | 2 +- + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 2 - + .../selftests/bpf/progs/{tag.c => btf_decl_tag.c} | 4 - + tools/testing/selftests/bpf/progs/btf_type_tag.c | 25 + + tools/testing/selftests/bpf/progs/exhandler_kern.c | 43 + + tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 2 +- + tools/testing/selftests/bpf/progs/find_vma.c | 69 + + tools/testing/selftests/bpf/progs/find_vma_fail1.c | 29 + + tools/testing/selftests/bpf/progs/find_vma_fail2.c | 29 + + tools/testing/selftests/bpf/progs/test_l4lb.c | 2 +- + .../selftests/bpf/progs/test_l4lb_noinline.c | 2 +- + tools/testing/selftests/bpf/progs/test_map_lock.c | 2 +- + .../selftests/bpf/progs/test_queue_stack_map.h | 2 +- + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 8 + + .../selftests/bpf/progs/test_sk_storage_tracing.c | 2 +- + tools/testing/selftests/bpf/progs/test_skb_ctx.c | 2 +- + .../selftests/bpf/progs/test_skc_to_unix_sock.c | 2 +- + tools/testing/selftests/bpf/progs/test_spin_lock.c | 2 +- + .../testing/selftests/bpf/progs/test_tcp_estats.c | 2 +- + tools/testing/selftests/bpf/test_btf.h | 3 + + tools/testing/selftests/bpf/test_cgroup_storage.c | 3 +- + tools/testing/selftests/bpf/test_dev_cgroup.c | 3 +- + tools/testing/selftests/bpf/test_lirc_mode2_user.c | 6 +- + tools/testing/selftests/bpf/test_lru_map.c | 9 +- + tools/testing/selftests/bpf/test_maps.c | 7 +- + tools/testing/selftests/bpf/test_sock.c | 23 +- + tools/testing/selftests/bpf/test_sock_addr.c | 13 +- + tools/testing/selftests/bpf/test_stub.c | 44 - + tools/testing/selftests/bpf/test_sysctl.c | 23 +- + tools/testing/selftests/bpf/test_tag.c | 3 +- + tools/testing/selftests/bpf/test_tcpnotify_user.c | 7 +- + tools/testing/selftests/bpf/test_verifier.c | 38 +- + tools/testing/selftests/bpf/testing_helpers.c | 60 + + tools/testing/selftests/bpf/testing_helpers.h | 6 + + .../testing/selftests/bpf/verifier/ctx_sk_lookup.c | 32 + + tools/testing/selftests/bpf/xdping.c | 3 +- + tools/testing/selftests/bpf/xdpxceiver.c | 2 - + tools/testing/selftests/net/fcnal-test.sh | 42 +- + .../selftests/net/forwarding/bridge_vlan_mcast.sh | 543 +++ + tools/testing/selftests/net/mptcp/config | 8 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 51 +- + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 80 + + tools/testing/selftests/net/nettest.c | 33 +- + 751 files changed, 33723 insertions(+), 12662 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/dsa/dsa-port.yaml + create mode 100644 Documentation/devicetree/bindings/net/engleder,tsnep.yaml + create mode 100644 Documentation/devicetree/bindings/net/intel,ixp4xx-hss.yaml + create mode 100644 Documentation/devicetree/bindings/net/microchip,lan966x-switch.yaml + create mode 100644 Documentation/devicetree/bindings/net/qcom,bam-dmux.yaml + create mode 100644 drivers/bluetooth/btmtk.c + create mode 100644 drivers/bluetooth/btmtk.h + create mode 100644 drivers/net/ethernet/engleder/Kconfig + create mode 100644 drivers/net/ethernet/engleder/Makefile + create mode 100644 drivers/net/ethernet/engleder/tsnep.h + create mode 100644 drivers/net/ethernet/engleder/tsnep_ethtool.c + create mode 100644 drivers/net/ethernet/engleder/tsnep_hw.h + create mode 100644 drivers/net/ethernet/engleder/tsnep_main.c + create mode 100644 drivers/net/ethernet/engleder/tsnep_ptp.c + create mode 100644 drivers/net/ethernet/engleder/tsnep_selftests.c + create mode 100644 drivers/net/ethernet/engleder/tsnep_tc.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_counter.c + create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_counter.h + create mode 100644 drivers/net/ethernet/microchip/lan966x/Kconfig + create mode 100644 drivers/net/ethernet/microchip/lan966x/Makefile + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_ifh.h + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_mac.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_main.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_main.h + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_phylink.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_port.c + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_regs.h + create mode 100644 drivers/net/ethernet/microsoft/mana/mana_bpf.c + create mode 100644 drivers/net/mctp/mctp-serial.c + create mode 100644 drivers/net/wwan/iosm/iosm_ipc_trace.c + create mode 100644 drivers/net/wwan/iosm/iosm_ipc_trace.h + create mode 100644 drivers/net/wwan/qcom_bam_dmux.c + create mode 100644 include/linux/mdio/mdio-mscc-miim.h + create mode 100644 include/net/bluetooth/hci_sync.h + create mode 100644 kernel/bpf/mmap_unlock_work.h + create mode 100644 net/bluetooth/hci_sync.c + create mode 100644 net/core/dev_addr_lists_test.c + create mode 100644 net/core/gro.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/exhandler.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/find_vma.c + rename tools/testing/selftests/bpf/progs/{tag.c => btf_decl_tag.c} (94%) + create mode 100644 tools/testing/selftests/bpf/progs/btf_type_tag.c + create mode 100644 tools/testing/selftests/bpf/progs/exhandler_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/find_vma.c + create mode 100644 tools/testing/selftests/bpf/progs/find_vma_fail1.c + create mode 100644 tools/testing/selftests/bpf/progs/find_vma_fail2.c + delete mode 100644 tools/testing/selftests/bpf/test_stub.c + create mode 100755 tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh +Merging bpf-next/for-next (942df4dc5ea1 bpftool: Add debug mode for gen_loader.) +$ 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 tools/testing/selftests/bpf/test_verifier.c +Auto-merging tools/testing/selftests/bpf/Makefile +Auto-merging tools/perf/tests/bpf.c +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging tools/lib/bpf/gen_loader.c +Auto-merging tools/lib/bpf/bpf_gen_internal.h +Auto-merging tools/bpf/resolve_btfids/main.c +Auto-merging net/ipv4/bpf_tcp_ca.c +Auto-merging net/core/filter.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/helpers.c +Auto-merging kernel/bpf/btf.c +CONFLICT (content): Merge conflict in kernel/bpf/btf.c +Auto-merging include/linux/btf.h +Auto-merging include/linux/bpf.h +Auto-merging arch/powerpc/net/bpf_jit_comp64.c +Auto-merging arch/powerpc/net/bpf_jit_comp32.c +Auto-merging MAINTAINERS +Auto-merging Documentation/bpf/index.rst +CONFLICT (content): Merge conflict in Documentation/bpf/index.rst +Resolved 'Documentation/bpf/index.rst' using previous resolution. +Recorded preimage for 'kernel/bpf/btf.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'kernel/bpf/btf.c'. +[master ec2236dd0bda] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/btf.rst | 44 +- + Documentation/bpf/faq.rst | 11 + + Documentation/bpf/helpers.rst | 7 + + Documentation/bpf/index.rst | 102 +- + Documentation/bpf/instruction-set.rst | 467 +++++++++ + Documentation/bpf/libbpf/index.rst | 4 +- + Documentation/bpf/maps.rst | 52 + + Documentation/bpf/other.rst | 9 + + Documentation/bpf/{bpf_lsm.rst => prog_lsm.rst} | 0 + Documentation/bpf/programs.rst | 9 + + Documentation/bpf/syscall_api.rst | 11 + + Documentation/bpf/test_debug.rst | 9 + + Documentation/bpf/verifier.rst | 529 ++++++++++ + Documentation/networking/filter.rst | 1036 +------------------- + MAINTAINERS | 2 +- + arch/arm/net/bpf_jit_32.c | 7 +- + arch/arm64/net/bpf_jit_comp.c | 7 +- + arch/mips/net/bpf_jit_comp32.c | 3 +- + arch/mips/net/bpf_jit_comp64.c | 2 +- + arch/powerpc/net/bpf_jit_comp32.c | 4 +- + arch/powerpc/net/bpf_jit_comp64.c | 4 +- + arch/riscv/net/bpf_jit_comp32.c | 6 +- + arch/riscv/net/bpf_jit_comp64.c | 7 +- + arch/s390/net/bpf_jit_comp.c | 6 +- + arch/sparc/net/bpf_jit_comp_64.c | 4 +- + arch/x86/net/bpf_jit_comp.c | 14 +- + arch/x86/net/bpf_jit_comp32.c | 4 +- + include/linux/bpf.h | 11 +- + include/linux/bpf_verifier.h | 7 + + include/linux/btf.h | 89 +- + include/uapi/linux/bpf.h | 105 +- + kernel/bpf/Makefile | 4 + + kernel/bpf/bpf_iter.c | 35 + + kernel/bpf/bpf_struct_ops.c | 6 +- + kernel/bpf/btf.c | 406 +++++++- + kernel/bpf/core.c | 6 +- + kernel/bpf/helpers.c | 2 + + kernel/bpf/syscall.c | 4 +- + kernel/bpf/verifier.c | 180 +++- + lib/test_bpf.c | 4 +- + net/core/filter.c | 11 +- + net/ipv4/bpf_tcp_ca.c | 6 +- + samples/bpf/Makefile | 13 +- + samples/bpf/Makefile.target | 11 - + samples/bpf/cookie_uid_helper_example.c | 14 +- + samples/bpf/fds_example.c | 29 +- + samples/bpf/lwt_len_hist_kern.c | 7 - + samples/bpf/map_perf_test_user.c | 15 +- + samples/bpf/sock_example.c | 12 +- + samples/bpf/sockex1_user.c | 15 +- + samples/bpf/sockex2_user.c | 14 +- + samples/bpf/test_cgrp2_array_pin.c | 4 +- + samples/bpf/test_cgrp2_attach.c | 13 +- + samples/bpf/test_cgrp2_sock.c | 8 +- + samples/bpf/test_lru_dist.c | 11 +- + samples/bpf/trace_output_user.c | 4 +- + samples/bpf/xdp_sample_pkts_user.c | 22 +- + samples/bpf/xdpsock_ctrl_proc.c | 3 + + samples/bpf/xdpsock_user.c | 3 + + samples/bpf/xsk_fwd.c | 3 + + tools/bpf/bpftool/Documentation/Makefile | 2 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 7 +- + .../bpf/bpftool/Documentation/bpftool-feature.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-iter.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-link.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 6 +- + .../bpftool/Documentation/bpftool-struct_ops.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 7 +- + tools/bpf/bpftool/Documentation/common_options.rst | 2 + + tools/bpf/bpftool/Documentation/substitutions.rst | 3 + + tools/bpf/bpftool/main.c | 12 +- + tools/bpf/bpftool/map.c | 23 +- + tools/bpf/bpftool/prog.c | 20 +- + tools/bpf/resolve_btfids/main.c | 5 +- + tools/build/feature/test-bpf.c | 6 + + tools/include/uapi/linux/bpf.h | 105 +- + tools/lib/bpf/bpf.c | 146 ++- + tools/lib/bpf/bpf.h | 33 +- + tools/lib/bpf/bpf_gen_internal.h | 9 +- + tools/lib/bpf/btf.c | 59 +- + tools/lib/bpf/btf.h | 2 +- + tools/lib/bpf/btf_dump.c | 2 +- + tools/lib/bpf/gen_loader.c | 160 ++- + tools/lib/bpf/libbpf.c | 450 ++++++--- + tools/lib/bpf/libbpf.h | 9 +- + tools/lib/bpf/libbpf.map | 12 +- + tools/lib/bpf/libbpf_common.h | 5 + + tools/lib/bpf/libbpf_internal.h | 23 +- + tools/lib/bpf/libbpf_probes.c | 30 +- + tools/lib/bpf/libbpf_version.h | 2 +- + tools/lib/bpf/linker.c | 6 +- + tools/lib/bpf/relo_core.c | 231 +++-- + tools/lib/bpf/relo_core.h | 103 +- + tools/lib/bpf/skel_internal.h | 13 +- + tools/lib/bpf/xsk.c | 18 +- + tools/perf/tests/bpf.c | 4 + + tools/perf/util/bpf-loader.c | 3 + + tools/testing/selftests/bpf/Makefile | 49 +- + tools/testing/selftests/bpf/bench.c | 47 + + tools/testing/selftests/bpf/bench.h | 2 + + .../testing/selftests/bpf/benchs/bench_bpf_loop.c | 105 ++ + tools/testing/selftests/bpf/benchs/bench_trigger.c | 146 +++ + .../selftests/bpf/benchs/run_bench_bpf_loop.sh | 15 + + tools/testing/selftests/bpf/benchs/run_common.sh | 15 + + .../selftests/bpf/map_tests/array_map_batch_ops.c | 13 +- + .../selftests/bpf/map_tests/htab_map_batch_ops.c | 13 +- + .../bpf/map_tests/lpm_trie_map_batch_ops.c | 15 +- + .../selftests/bpf/map_tests/sk_storage_map.c | 50 +- + tools/testing/selftests/bpf/prog_tests/atomics.c | 4 +- + .../selftests/bpf/prog_tests/bloom_filter_map.c | 36 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 13 +- + tools/testing/selftests/bpf/prog_tests/bpf_loop.c | 145 +++ + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 42 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 77 +- + .../selftests/bpf/prog_tests/btf_dedup_split.c | 113 +++ + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 4 +- + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 12 +- + .../selftests/bpf/prog_tests/connect_force_port.c | 17 +- + tools/testing/selftests/bpf/prog_tests/core_kern.c | 14 + + .../testing/selftests/bpf/prog_tests/core_reloc.c | 3 +- + .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 14 +- + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 58 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 24 + + .../selftests/bpf/prog_tests/legacy_printk.c | 65 ++ + tools/testing/selftests/bpf/prog_tests/map_ptr.c | 16 +- + tools/testing/selftests/bpf/prog_tests/pinning.c | 4 +- + .../selftests/bpf/prog_tests/prog_array_init.c | 32 + + .../selftests/bpf/prog_tests/queue_stack_map.c | 12 +- + .../selftests/bpf/prog_tests/ringbuf_multi.c | 4 +- + .../selftests/bpf/prog_tests/select_reuseport.c | 21 +- + .../selftests/bpf/prog_tests/sockmap_basic.c | 4 +- + .../selftests/bpf/prog_tests/sockmap_ktls.c | 2 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 4 +- + .../selftests/bpf/prog_tests/sockopt_inherit.c | 12 +- + .../selftests/bpf/prog_tests/sockopt_multi.c | 12 +- + tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 21 +- + .../testing/selftests/bpf/prog_tests/test_bpffs.c | 6 +- + .../selftests/bpf/prog_tests/test_global_funcs.c | 28 +- + tools/testing/selftests/bpf/prog_tests/xdp.c | 11 +- + .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 36 +- + .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 6 +- + tools/testing/selftests/bpf/progs/bpf_loop.c | 112 +++ + tools/testing/selftests/bpf/progs/bpf_loop_bench.c | 26 + + tools/testing/selftests/bpf/progs/core_kern.c | 104 ++ + tools/testing/selftests/bpf/progs/map_ptr_kern.c | 16 +- + tools/testing/selftests/bpf/progs/pyperf.h | 71 +- + .../selftests/bpf/progs/pyperf600_bpf_loop.c | 6 + + tools/testing/selftests/bpf/progs/strobemeta.h | 75 +- + .../selftests/bpf/progs/strobemeta_bpf_loop.c | 9 + + .../testing/selftests/bpf/progs/test_ksyms_weak.c | 2 +- + .../selftests/bpf/progs/test_legacy_printk.c | 73 ++ + .../selftests/bpf/progs/test_prog_array_init.c | 39 + + .../selftests/bpf/progs/test_verif_scale2.c | 4 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 7 + + .../selftests/bpf/test_bpftool_synctypes.py | 94 +- + tools/testing/selftests/bpf/test_cgroup_storage.c | 8 +- + tools/testing/selftests/bpf/test_lpm_map.c | 27 +- + tools/testing/selftests/bpf/test_lru_map.c | 16 +- + tools/testing/selftests/bpf/test_maps.c | 110 ++- + tools/testing/selftests/bpf/test_progs.c | 28 +- + tools/testing/selftests/bpf/test_sock_addr.c | 33 +- + tools/testing/selftests/bpf/test_tag.c | 5 +- + tools/testing/selftests/bpf/test_verifier.c | 52 +- + tools/testing/selftests/bpf/testing_helpers.c | 4 +- + tools/testing/selftests/bpf/vmtest.sh | 46 +- + tools/testing/selftests/bpf/xdp_redirect_multi.c | 15 +- + tools/testing/selftests/bpf/xdpxceiver.c | 12 +- + 172 files changed, 4975 insertions(+), 2374 deletions(-) + create mode 100644 Documentation/bpf/faq.rst + create mode 100644 Documentation/bpf/helpers.rst + create mode 100644 Documentation/bpf/instruction-set.rst + create mode 100644 Documentation/bpf/maps.rst + create mode 100644 Documentation/bpf/other.rst + rename Documentation/bpf/{bpf_lsm.rst => prog_lsm.rst} (100%) + create mode 100644 Documentation/bpf/programs.rst + create mode 100644 Documentation/bpf/syscall_api.rst + create mode 100644 Documentation/bpf/test_debug.rst + create mode 100644 Documentation/bpf/verifier.rst + create mode 100644 tools/bpf/bpftool/Documentation/substitutions.rst + create mode 100644 tools/testing/selftests/bpf/benchs/bench_bpf_loop.c + create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_bpf_loop.sh + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_loop.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_kern.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/legacy_printk.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/prog_array_init.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_loop.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_loop_bench.c + create mode 100644 tools/testing/selftests/bpf/progs/core_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf600_bpf_loop.c + create mode 100644 tools/testing/selftests/bpf/progs/strobemeta_bpf_loop.c + create mode 100644 tools/testing/selftests/bpf/progs/test_legacy_printk.c + create mode 100644 tools/testing/selftests/bpf/progs/test_prog_array_init.c +$ git reset --hard HEAD^ +HEAD is now at 99137b9ec808 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +Merging next-20211202 version of bpf-next +$ git merge -m next-20211202/bpf-next 64b5b97b8cfff64409fcc234ae3151bc8de0c4d6 +Auto-merging tools/testing/selftests/bpf/test_verifier.c +Auto-merging tools/testing/selftests/bpf/Makefile +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging tools/lib/bpf/gen_loader.c +Auto-merging tools/lib/bpf/bpf_gen_internal.h +Auto-merging tools/bpf/resolve_btfids/main.c +Auto-merging net/core/filter.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/helpers.c +Auto-merging include/linux/bpf.h +Auto-merging arch/powerpc/net/bpf_jit_comp64.c +Auto-merging arch/powerpc/net/bpf_jit_comp32.c +Auto-merging MAINTAINERS +Auto-merging Documentation/bpf/index.rst +CONFLICT (content): Merge conflict in Documentation/bpf/index.rst +Resolved 'Documentation/bpf/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5f41809898ff] next-20211202/bpf-next +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/btf.rst | 44 +- + Documentation/bpf/faq.rst | 11 + + Documentation/bpf/helpers.rst | 7 + + Documentation/bpf/index.rst | 102 +- + Documentation/bpf/instruction-set.rst | 467 +++++++++ + Documentation/bpf/libbpf/index.rst | 4 +- + Documentation/bpf/maps.rst | 52 + + Documentation/bpf/other.rst | 9 + + Documentation/bpf/{bpf_lsm.rst => prog_lsm.rst} | 0 + Documentation/bpf/programs.rst | 9 + + Documentation/bpf/syscall_api.rst | 11 + + Documentation/bpf/test_debug.rst | 9 + + Documentation/bpf/verifier.rst | 529 ++++++++++ + Documentation/networking/filter.rst | 1036 +------------------- + MAINTAINERS | 2 +- + arch/arm/net/bpf_jit_32.c | 7 +- + arch/arm64/net/bpf_jit_comp.c | 7 +- + arch/mips/net/bpf_jit_comp32.c | 3 +- + arch/mips/net/bpf_jit_comp64.c | 2 +- + arch/powerpc/net/bpf_jit_comp32.c | 4 +- + arch/powerpc/net/bpf_jit_comp64.c | 4 +- + arch/riscv/net/bpf_jit_comp32.c | 6 +- + arch/riscv/net/bpf_jit_comp64.c | 7 +- + arch/s390/net/bpf_jit_comp.c | 6 +- + arch/sparc/net/bpf_jit_comp_64.c | 4 +- + arch/x86/net/bpf_jit_comp.c | 14 +- + arch/x86/net/bpf_jit_comp32.c | 4 +- + include/linux/bpf.h | 3 +- + include/uapi/linux/bpf.h | 27 +- + kernel/bpf/bpf_iter.c | 35 + + kernel/bpf/core.c | 6 +- + kernel/bpf/helpers.c | 2 + + kernel/bpf/syscall.c | 2 +- + kernel/bpf/verifier.c | 98 +- + lib/test_bpf.c | 4 +- + net/core/filter.c | 11 +- + samples/bpf/fds_example.c | 9 +- + tools/bpf/bpftool/Documentation/Makefile | 2 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 7 +- + .../bpf/bpftool/Documentation/bpftool-feature.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-iter.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-link.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 6 +- + .../bpftool/Documentation/bpftool-struct_ops.rst | 6 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 7 +- + tools/bpf/bpftool/Documentation/common_options.rst | 2 + + tools/bpf/bpftool/Documentation/substitutions.rst | 3 + + tools/bpf/bpftool/main.c | 12 +- + tools/bpf/resolve_btfids/main.c | 5 +- + tools/build/feature/test-bpf.c | 6 + + tools/include/uapi/linux/bpf.h | 27 +- + tools/lib/bpf/bpf.c | 146 ++- + tools/lib/bpf/bpf.h | 33 +- + tools/lib/bpf/bpf_gen_internal.h | 5 +- + tools/lib/bpf/btf.c | 57 +- + tools/lib/bpf/btf.h | 2 +- + tools/lib/bpf/btf_dump.c | 2 +- + tools/lib/bpf/gen_loader.c | 88 +- + tools/lib/bpf/libbpf.c | 285 ++++-- + tools/lib/bpf/libbpf.h | 6 +- + tools/lib/bpf/libbpf.map | 6 +- + tools/lib/bpf/libbpf_internal.h | 21 - + tools/lib/bpf/libbpf_probes.c | 30 +- + tools/lib/bpf/linker.c | 6 +- + tools/lib/bpf/skel_internal.h | 13 +- + tools/lib/bpf/xsk.c | 18 +- + tools/testing/selftests/bpf/Makefile | 8 +- + tools/testing/selftests/bpf/bench.c | 47 + + tools/testing/selftests/bpf/bench.h | 2 + + .../testing/selftests/bpf/benchs/bench_bpf_loop.c | 105 ++ + tools/testing/selftests/bpf/benchs/bench_trigger.c | 146 +++ + .../selftests/bpf/benchs/run_bench_bpf_loop.sh | 15 + + tools/testing/selftests/bpf/benchs/run_common.sh | 15 + + .../selftests/bpf/map_tests/array_map_batch_ops.c | 13 +- + .../selftests/bpf/map_tests/htab_map_batch_ops.c | 13 +- + .../bpf/map_tests/lpm_trie_map_batch_ops.c | 15 +- + .../selftests/bpf/map_tests/sk_storage_map.c | 50 +- + .../selftests/bpf/prog_tests/bloom_filter_map.c | 36 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 8 +- + tools/testing/selftests/bpf/prog_tests/bpf_loop.c | 145 +++ + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 12 + + tools/testing/selftests/bpf/prog_tests/btf.c | 77 +- + .../selftests/bpf/prog_tests/btf_dedup_split.c | 113 +++ + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 4 +- + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 12 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 3 +- + .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 14 +- + .../selftests/bpf/prog_tests/legacy_printk.c | 65 ++ + tools/testing/selftests/bpf/prog_tests/pinning.c | 4 +- + .../selftests/bpf/prog_tests/prog_array_init.c | 32 + + .../selftests/bpf/prog_tests/queue_stack_map.c | 12 +- + .../selftests/bpf/prog_tests/ringbuf_multi.c | 4 +- + .../selftests/bpf/prog_tests/select_reuseport.c | 21 +- + .../selftests/bpf/prog_tests/sockmap_basic.c | 4 +- + .../selftests/bpf/prog_tests/sockmap_ktls.c | 2 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 4 +- + .../testing/selftests/bpf/prog_tests/test_bpffs.c | 6 +- + tools/testing/selftests/bpf/prog_tests/xdp.c | 11 +- + .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 36 +- + .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 6 +- + tools/testing/selftests/bpf/progs/bpf_loop.c | 112 +++ + tools/testing/selftests/bpf/progs/bpf_loop_bench.c | 26 + + tools/testing/selftests/bpf/progs/pyperf.h | 71 +- + .../selftests/bpf/progs/pyperf600_bpf_loop.c | 6 + + tools/testing/selftests/bpf/progs/strobemeta.h | 75 +- + .../selftests/bpf/progs/strobemeta_bpf_loop.c | 9 + + .../selftests/bpf/progs/test_legacy_printk.c | 73 ++ + .../selftests/bpf/progs/test_prog_array_init.c | 39 + + tools/testing/selftests/bpf/progs/trigger_bench.c | 7 + + .../selftests/bpf/test_bpftool_synctypes.py | 94 +- + tools/testing/selftests/bpf/test_cgroup_storage.c | 8 +- + tools/testing/selftests/bpf/test_lpm_map.c | 27 +- + tools/testing/selftests/bpf/test_lru_map.c | 16 +- + tools/testing/selftests/bpf/test_maps.c | 110 ++- + tools/testing/selftests/bpf/test_progs.c | 28 +- + tools/testing/selftests/bpf/test_tag.c | 5 +- + tools/testing/selftests/bpf/test_verifier.c | 52 +- + tools/testing/selftests/bpf/testing_helpers.c | 4 +- + tools/testing/selftests/bpf/vmtest.sh | 46 +- + tools/testing/selftests/bpf/xdpxceiver.c | 6 +- + 125 files changed, 3403 insertions(+), 1881 deletions(-) + create mode 100644 Documentation/bpf/faq.rst + create mode 100644 Documentation/bpf/helpers.rst + create mode 100644 Documentation/bpf/instruction-set.rst + create mode 100644 Documentation/bpf/maps.rst + create mode 100644 Documentation/bpf/other.rst + rename Documentation/bpf/{bpf_lsm.rst => prog_lsm.rst} (100%) + create mode 100644 Documentation/bpf/programs.rst + create mode 100644 Documentation/bpf/syscall_api.rst + create mode 100644 Documentation/bpf/test_debug.rst + create mode 100644 Documentation/bpf/verifier.rst + create mode 100644 tools/bpf/bpftool/Documentation/substitutions.rst + create mode 100644 tools/testing/selftests/bpf/benchs/bench_bpf_loop.c + create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_bpf_loop.sh + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_loop.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/legacy_printk.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/prog_array_init.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_loop.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_loop_bench.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf600_bpf_loop.c + create mode 100644 tools/testing/selftests/bpf/progs/strobemeta_bpf_loop.c + create mode 100644 tools/testing/selftests/bpf/progs/test_legacy_printk.c + create mode 100644 tools/testing/selftests/bpf/progs/test_prog_array_init.c +Merging ipsec-next/master (ac1077e92825 net: xfrm: drop check of pols[0] for the second time) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/ipv6/esp6.c +Merge made by the 'recursive' strategy. + net/ipv6/esp6.c | 3 +-- + net/xfrm/xfrm_policy.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging mlx5-next/mlx5-next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (632cb151ca53 netfilter: ctnetlink: remove useless type conversion to bool) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Auto-merging net/netfilter/nfnetlink_queue.c +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_ctl.c | 7 ++----- + net/netfilter/nf_conntrack_core.c | 4 +--- + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/netfilter/nfnetlink_queue.c | 6 ------ + 4 files changed, 4 insertions(+), 15 deletions(-) +Merging ipvs-next/master (ec574d9ee5d2 net: phylink: add 1000base-KX to phylink_caps_to_linkmodes()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (fe6db7eda930 iwlwifi: mei: fix linking when tracing is not enabled) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git wireless-drivers-next/master +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/drv.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/ops.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Merge made by the 'recursive' strategy. + drivers/misc/mei/bus.c | 67 +- + drivers/misc/mei/client.c | 3 + + drivers/misc/mei/hw.h | 5 + + drivers/net/wireless/ath/ar5523/ar5523.c | 4 + + drivers/net/wireless/ath/ath10k/core.c | 64 +- + drivers/net/wireless/ath/ath10k/core.h | 6 + + drivers/net/wireless/ath/ath11k/ce.c | 55 +- + drivers/net/wireless/ath/ath11k/ce.h | 3 +- + drivers/net/wireless/ath/ath11k/core.c | 52 +- + drivers/net/wireless/ath/ath11k/core.h | 16 + + drivers/net/wireless/ath/ath11k/dbring.c | 16 +- + drivers/net/wireless/ath/ath11k/dbring.h | 2 +- + drivers/net/wireless/ath/ath11k/debug.c | 12 +- + drivers/net/wireless/ath/ath11k/debug.h | 3 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 2 +- + drivers/net/wireless/ath/ath11k/dp.c | 48 +- + drivers/net/wireless/ath/ath11k/dp.h | 4 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 225 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 86 +- + drivers/net/wireless/ath/ath11k/hal.c | 35 +- + drivers/net/wireless/ath/ath11k/hal.h | 1 + + drivers/net/wireless/ath/ath11k/htc.c | 71 +- + drivers/net/wireless/ath/ath11k/htc.h | 9 +- + drivers/net/wireless/ath/ath11k/hw.c | 2 - + drivers/net/wireless/ath/ath11k/hw.h | 5 + + drivers/net/wireless/ath/ath11k/mac.c | 324 +- + drivers/net/wireless/ath/ath11k/mac.h | 1 + + drivers/net/wireless/ath/ath11k/pci.c | 22 +- + drivers/net/wireless/ath/ath11k/peer.h | 1 + + drivers/net/wireless/ath/ath11k/qmi.c | 21 +- + drivers/net/wireless/ath/ath11k/reg.c | 103 +- + drivers/net/wireless/ath/ath11k/trace.c | 1 + + drivers/net/wireless/ath/ath11k/trace.h | 172 + + drivers/net/wireless/ath/ath11k/wmi.c | 159 +- + drivers/net/wireless/ath/ath11k/wmi.h | 20 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 14 +- + drivers/net/wireless/ath/wcn36xx/dxe.c | 96 +- + drivers/net/wireless/ath/wcn36xx/dxe.h | 1 + + drivers/net/wireless/ath/wcn36xx/main.c | 49 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 8 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 41 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 21 + + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 19 + + drivers/net/wireless/intel/iwlwifi/Kconfig | 26 + + drivers/net/wireless/intel/iwlwifi/Makefile | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 61 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 11 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 2 + + drivers/net/wireless/intel/iwlwifi/mei/Makefile | 8 + + drivers/net/wireless/intel/iwlwifi/mei/internal.h | 20 + + drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h | 505 + + drivers/net/wireless/intel/iwlwifi/mei/main.c | 1982 +++ + drivers/net/wireless/intel/iwlwifi/mei/net.c | 409 + + drivers/net/wireless/intel/iwlwifi/mei/sap.h | 733 ++ + .../net/wireless/intel/iwlwifi/mei/trace-data.h | 82 + + drivers/net/wireless/intel/iwlwifi/mei/trace.c | 15 + + drivers/net/wireless/intel/iwlwifi/mei/trace.h | 76 + + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 120 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 74 + + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 203 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 7 +- + .../net/wireless/intel/iwlwifi/mvm/vendor-cmd.c | 151 + + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 25 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 21 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 5 +- + drivers/net/wireless/intersil/hostap/hostap_wlan.h | 14 +- + drivers/net/wireless/marvell/libertas/host.h | 10 +- + drivers/net/wireless/marvell/libertas/tx.c | 5 +- + .../net/wireless/marvell/libertas_tf/libertas_tf.h | 10 +- + drivers/net/wireless/marvell/libertas_tf/main.c | 3 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 4 +- + drivers/net/wireless/marvell/mwifiex/main.c | 18 + + drivers/net/wireless/marvell/mwifiex/main.h | 5 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 3 + + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 28 +- + drivers/net/wireless/marvell/mwifiex/sta_event.c | 3 + + drivers/net/wireless/marvell/mwifiex/usb.c | 3 +- + drivers/net/wireless/marvell/mwl8k.c | 10 +- + drivers/net/wireless/microchip/wilc1000/wlan.c | 5 - + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 17 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 - + drivers/net/wireless/realtek/rtw88/debug.c | 39 + + drivers/net/wireless/realtek/rtw88/main.h | 1 + + drivers/net/wireless/realtek/rtw88/pci.c | 9 + + drivers/net/wireless/realtek/rtw88/tx.c | 27 +- + drivers/net/wireless/realtek/rtw89/core.h | 9 +- + drivers/net/wireless/realtek/rtw89/debug.c | 7 +- + drivers/net/wireless/realtek/rtw89/mac.c | 5 +- + drivers/net/wireless/realtek/rtw89/mac.h | 10 + + drivers/net/wireless/realtek/rtw89/phy.c | 47 +- + drivers/net/wireless/realtek/rtw89/regd.c | 375 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 4 +- + .../net/wireless/realtek/rtw89/rtw8852a_table.c | 12201 +++++++++++-------- + drivers/net/wireless/rsi/rsi_91x_main.c | 4 + + drivers/net/wireless/rsi/rsi_91x_usb.c | 9 +- + drivers/net/wireless/rsi/rsi_usb.h | 2 + + drivers/net/wireless/ti/wlcore/sdio.c | 2 +- + include/linux/mei_cl_bus.h | 3 + + 103 files changed, 13380 insertions(+), 5930 deletions(-) + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/Makefile + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/internal.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/main.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/net.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/sap.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/trace-data.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/trace.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/trace.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c +Merging bluetooth/master (aeb8b133415a Bluetooth: hci_sync: Set Privacy Mode when updating the resolving list) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging include/linux/skbuff.h +Merge made by the 'recursive' strategy. + drivers/bluetooth/btbcm.c | 39 + + drivers/bluetooth/btmtksdio.c | 49 +- + drivers/bluetooth/btusb.c | 166 +- + include/linux/skbuff.h | 2 + + include/net/bluetooth/hci.h | 84 +- + include/net/bluetooth/hci_core.h | 36 +- + include/net/bluetooth/hci_sync.h | 1 + + include/net/bluetooth/mgmt.h | 9 +- + net/bluetooth/hci_core.c | 22 +- + net/bluetooth/hci_event.c | 3122 ++++++++++++++++++++------------------ + net/bluetooth/hci_request.c | 17 +- + net/bluetooth/hci_request.h | 1 - + net/bluetooth/hci_sync.c | 78 +- + net/bluetooth/mgmt.c | 68 +- + net/bluetooth/msft.c | 2 +- + net/bluetooth/msft.h | 2 +- + net/core/skbuff.c | 23 + + 17 files changed, 2177 insertions(+), 1544 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at ec003762c063 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git +Merging next-20211203 version of bluetooth +$ git merge -m next-20211203/bluetooth dbf6811abbfcc79d3cd5ce1ff53fe1c741167a1f +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmtksdio.c | 34 ++++++++++++++++++++++++++++------ + drivers/bluetooth/btusb.c | 23 +++++++++++++++++++++-- + include/net/bluetooth/hci.h | 6 +++--- + include/net/bluetooth/hci_core.h | 7 +++++-- + include/net/bluetooth/mgmt.h | 9 +++++---- + net/bluetooth/hci_event.c | 34 +++++++++++++++++++--------------- + net/bluetooth/mgmt.c | 12 ++++++++++-- + 7 files changed, 91 insertions(+), 34 deletions(-) +Merging mac80211-next/master (75c5bd68b699 ieee80211: change HE nominal packet padding value defines) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git mac80211-next/master +Auto-merging drivers/net/wireless/realtek/rtw89/fw.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/carl9170/tx.c | 12 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 16 +-- + drivers/net/wireless/intersil/p54/txrx.c | 6 +- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 3 +- + drivers/net/wireless/realtek/rtw89/core.c | 3 +- + drivers/net/wireless/realtek/rtw89/fw.c | 2 +- + include/linux/ieee80211.h | 11 +- + include/net/cfg80211.h | 43 +++++- + include/net/mac80211.h | 24 +++- + include/uapi/linux/nl80211.h | 13 ++ + net/mac80211/cfg.c | 31 +++++ + net/mac80211/debugfs_sta.c | 9 +- + net/mac80211/driver-ops.h | 22 +++ + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/iface.c | 59 ++++++++ + net/mac80211/rc80211_minstrel_ht.c | 2 - + net/mac80211/trace.h | 7 + + net/mac80211/wpa.c | 4 - + net/wireless/chan.c | 16 +++ + net/wireless/core.c | 7 + + net/wireless/core.h | 16 +++ + net/wireless/mlme.c | 152 ++++++++++++++++++++- + net/wireless/nl80211.c | 77 +++++++---- + net/wireless/rdev-ops.h | 17 +++ + net/wireless/scan.c | 35 ++--- + net/wireless/sme.c | 22 ++- + net/wireless/trace.h | 30 +++- + net/wireless/wext-sme.c | 12 +- + 31 files changed, 542 insertions(+), 122 deletions(-) +Merging mtd/mtd/next (ab14a0c836f8 mtdchar: prevent unbounded allocation in MEMWRITE ioctl) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Removing include/linux/mtd/latch-addr-flash.h +Auto-merging drivers/mtd/nand/raw/nand_base.c +Auto-merging drivers/mtd/devices/mtd_dataflash.c +Merge made by the 'recursive' strategy. + drivers/mtd/chips/gen_probe.c | 9 ++- + drivers/mtd/devices/mchp23k256.c | 4 +- + drivers/mtd/devices/mchp48l640.c | 4 +- + drivers/mtd/devices/mtd_dataflash.c | 10 ++-- + drivers/mtd/devices/sst25l.c | 4 +- + drivers/mtd/mtdchar.c | 110 +++++++++++++++++++++++++++-------- + drivers/mtd/mtdcore.c | 21 ++++++- + drivers/mtd/mtdpart.c | 2 +- + drivers/mtd/nand/core.c | 3 + + drivers/mtd/nand/raw/nand_base.c | 3 + + drivers/mtd/nand/raw/nand_bbt.c | 3 + + include/linux/mtd/latch-addr-flash.h | 29 --------- + include/linux/mtd/mtd.h | 3 + + 13 files changed, 136 insertions(+), 69 deletions(-) + delete mode 100644 include/linux/mtd/latch-addr-flash.h +Merging nand/nand/next (33a0da68fb07 mtd: rawnand: mpc5121: Remove unused variable in ads5121_select_chip()) +$ 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 drivers/mtd/nand/raw/nand_base.c +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/davinci_nand.c | 73 +------------------------ + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 37 +++++++++---- + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 5 ++ + drivers/mtd/nand/raw/mpc5121_nfc.c | 1 - + drivers/mtd/nand/raw/nand_base.c | 67 +++++++++++++++++++++++ + include/linux/mtd/rawnand.h | 2 + + 6 files changed, 100 insertions(+), 85 deletions(-) +Merging spi-nor/spi-nor/next (228e80459960 MAINTAINERS: Add myself as SPI NOR co-maintainer) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/mtd/spi-nor/atmel.c | 8 ++++---- + drivers/mtd/spi-nor/core.c | 37 ++++++++++++++++++++++--------------- + drivers/mtd/spi-nor/core.h | 11 +++++++---- + drivers/mtd/spi-nor/spansion.c | 4 ++-- + drivers/mtd/spi-nor/sst.c | 8 ++++---- + drivers/mtd/spi-nor/winbond.c | 5 +++++ + drivers/mtd/spi-nor/xilinx.c | 21 ++++++++++++--------- + include/linux/mtd/spi-nor.h | 2 -- + 9 files changed, 57 insertions(+), 41 deletions(-) +Merging crypto/master (0ea275df84c3 crypto: octeontx2 - uninitialized variable in kvf_limits_store()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Removing drivers/crypto/qat/qat_common/adf_vf2pf_msg.c +Removing drivers/crypto/qat/qat_common/adf_pf2vf_msg.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + crypto/Kconfig | 4 + + crypto/Makefile | 5 + + crypto/dh.c | 4 + + crypto/drbg.c | 143 +++---- + crypto/jitterentropy.c | 3 +- + crypto/kdf_sp800108.c | 153 ++++++++ + crypto/rsa.c | 4 + + crypto/testmgr.c | 9 - + crypto/testmgr.h | 6 +- + drivers/char/hw_random/Kconfig | 2 +- + drivers/char/hw_random/cavium-rng-vf.c | 194 +++++++++- + drivers/char/hw_random/cavium-rng.c | 11 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 21 ++ + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 1 + + drivers/crypto/atmel-aes.c | 6 +- + drivers/crypto/caam/caamalg.c | 6 + + drivers/crypto/caam/caamalg_qi2.c | 2 +- + drivers/crypto/caam/caamhash.c | 3 + + drivers/crypto/caam/caampkc.c | 3 + + drivers/crypto/ccp/ccp-dev.c | 2 +- + drivers/crypto/ccree/cc_request_mgr.c | 1 - + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 5 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 2 +- + drivers/crypto/hisilicon/qm.c | 183 +++++---- + drivers/crypto/hisilicon/sec2/sec_main.c | 2 +- + drivers/crypto/hisilicon/zip/zip_main.c | 4 +- + drivers/crypto/keembay/keembay-ocs-ecc.c | 1 + + drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 9 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 5 +- + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 18 +- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 11 +- + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 14 +- + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h | 1 - + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 2 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 11 +- + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 14 +- + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.h | 1 - + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 2 +- + drivers/crypto/qat/qat_common/Makefile | 6 +- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 25 +- + drivers/crypto/qat/qat_common/adf_common_drv.h | 30 +- + drivers/crypto/qat/qat_common/adf_gen2_hw_data.c | 48 --- + drivers/crypto/qat/qat_common/adf_gen2_hw_data.h | 13 - + drivers/crypto/qat/qat_common/adf_gen2_pfvf.c | 225 +++++++++++ + drivers/crypto/qat/qat_common/adf_gen2_pfvf.h | 29 ++ + drivers/crypto/qat/qat_common/adf_gen4_hw_data.c | 7 + + drivers/crypto/qat/qat_common/adf_init.c | 2 +- + drivers/crypto/qat/qat_common/adf_isr.c | 123 ++++-- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 416 --------------------- + .../qat_common/{adf_pf2vf_msg.h => adf_pfvf_msg.h} | 68 ++-- + drivers/crypto/qat/qat_common/adf_pfvf_pf_msg.c | 21 ++ + drivers/crypto/qat/qat_common/adf_pfvf_pf_msg.h | 10 + + drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c | 148 ++++++++ + drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.h | 13 + + drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.c | 97 +++++ + drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.h | 21 ++ + drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c | 134 +++++++ + drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.h | 14 + + drivers/crypto/qat/qat_common/adf_sriov.c | 20 +- + drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 48 --- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 92 ++--- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 41 +- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 2 + + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 14 +- + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h | 1 - + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 2 +- + drivers/crypto/qce/aead.c | 2 +- + drivers/crypto/qce/sha.c | 2 +- + drivers/crypto/qce/skcipher.c | 2 +- + drivers/crypto/sa2ul.c | 19 +- + include/crypto/drbg.h | 11 +- + include/crypto/internal/kdf_selftest.h | 71 ++++ + include/crypto/kdf_sp800108.h | 61 +++ + security/keys/Kconfig | 2 +- + security/keys/dh.c | 130 +------ + 76 files changed, 1732 insertions(+), 1107 deletions(-) + create mode 100644 crypto/kdf_sp800108.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen2_pfvf.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen2_pfvf.h + delete mode 100644 drivers/crypto/qat/qat_common/adf_pf2vf_msg.c + rename drivers/crypto/qat/qat_common/{adf_pf2vf_msg.h => adf_pfvf_msg.h} (81%) + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_pf_msg.c + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_pf_msg.h + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.h + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.c + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.h + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c + create mode 100644 drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.h + delete mode 100644 drivers/crypto/qat/qat_common/adf_vf2pf_msg.c + create mode 100644 include/crypto/internal/kdf_selftest.h + create mode 100644 include/crypto/kdf_sp800108.h +Merging drm/drm-next (c305ae99dfd4 Merge tag 'drm-intel-next-2021-11-30' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/gpu/drm/xen/xen_drm_front.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_ioctl.c +Auto-merging drivers/gpu/drm/vc4/vc4_kms.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_kms.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Removing drivers/gpu/drm/meson/meson_venc_cvbs.c +Auto-merging drivers/gpu/drm/lima/lima_device.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/display/bridge/sii9234.txt +Removing Documentation/devicetree/bindings/display/bridge/ptn3460.txt +Resolved 'drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c' using previous resolution. +Resolved 'drivers/gpu/drm/vc4/vc4_kms.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2d7e18688a98] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/analogix,anx7625.yaml | 65 +- + .../bindings/display/bridge/nxp,ptn3460.yaml | 106 ++ + .../devicetree/bindings/display/bridge/ptn3460.txt | 39 - + .../devicetree/bindings/display/bridge/sii9234.txt | 49 - + .../bindings/display/bridge/sil,sii9234.yaml | 110 ++ + .../bindings/display/panel/boe,bf060y8m-aj0.yaml | 81 + + .../bindings/display/panel/ilitek,ili9163.yaml | 69 + + .../bindings/display/panel/ilitek,ili9881c.yaml | 6 +- + .../bindings/display/panel/novatek,nt35950.yaml | 106 ++ + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../display/panel/sony,tulip-truly-nt35521.yaml | 72 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/drm-kms-helpers.rst | 15 + + Documentation/gpu/drm-kms.rst | 2 + + Documentation/gpu/todo.rst | 26 +- + MAINTAINERS | 19 +- + drivers/char/agp/intel-gtt.c | 1 + + drivers/clk/bcm/clk-bcm2835.c | 13 +- + drivers/dma-buf/Makefile | 3 +- + drivers/dma-buf/dma-buf.c | 32 +- + drivers/dma-buf/dma-fence.c | 17 + + drivers/dma-buf/dma-resv.c | 23 + + drivers/dma-buf/selftests.h | 1 + + drivers/dma-buf/st-dma-resv.c | 371 ++++ + drivers/gpu/drm/Kconfig | 8 +- + drivers/gpu/drm/Makefile | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 26 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +- + drivers/gpu/drm/bridge/Kconfig | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 - + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 15 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 20 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 14 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 491 ++++- + drivers/gpu/drm/bridge/analogix/anx7625.h | 23 +- + drivers/gpu/drm/bridge/display-connector.c | 88 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 31 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 62 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 65 +- + drivers/gpu/drm/bridge/lvds-codec.c | 21 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 346 ++-- + .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 10 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 4 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 9 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 13 +- + drivers/gpu/drm/bridge/tc358768.c | 94 +- + drivers/gpu/drm/bridge/tc358775.c | 50 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 128 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 466 ++++- + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_connector.c | 205 ++- + drivers/gpu/drm/drm_dp_helper.c | 261 ++- + drivers/gpu/drm/drm_drv.c | 13 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/drm_format_helper.c | 247 +-- + drivers/gpu/drm/drm_gem_atomic_helper.c | 14 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 5 + + drivers/gpu/drm/drm_gem_shmem_helper.c | 136 +- + drivers/gpu/drm/drm_irq.c | 2 - + drivers/gpu/drm/drm_mipi_dbi.c | 6 +- + drivers/gpu/drm/drm_of.c | 33 + + drivers/gpu/drm/drm_privacy_screen.c | 467 +++++ + drivers/gpu/drm/drm_privacy_screen_x86.c | 86 + + drivers/gpu/drm/drm_probe_helper.c | 48 +- + drivers/gpu/drm/drm_sysfs.c | 25 + + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 33 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +- + drivers/gpu/drm/gma500/framebuffer.c | 52 +- + drivers/gpu/drm/gma500/gem.c | 234 ++- + drivers/gpu/drm/gma500/gem.h | 28 +- + drivers/gpu/drm/gma500/gma_display.c | 51 +- + drivers/gpu/drm/gma500/gtt.c | 326 +--- + drivers/gpu/drm/gma500/gtt.h | 29 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 3 +- + drivers/gpu/drm/gma500/psb_drv.c | 12 + + drivers/gpu/drm/gma500/psb_intel_display.c | 17 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 2 +- + drivers/gpu/drm/gud/gud_pipe.c | 14 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 52 +- + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 5 +- + drivers/gpu/drm/i915/Kconfig | 2 +- + drivers/gpu/drm/i915/Makefile | 4 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 134 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 10 +- + drivers/gpu/drm/i915/display/icl_dsi.h | 15 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 96 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 23 +- + drivers/gpu/drm/i915/display/intel_audio.c | 140 +- + drivers/gpu/drm/i915/display/intel_audio.h | 4 +- + drivers/gpu/drm/i915/display/intel_bw.c | 213 ++- + drivers/gpu/drm/i915/display/intel_cdclk.c | 5 + + drivers/gpu/drm/i915/display/intel_color.c | 130 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_crt.c | 13 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 107 +- + drivers/gpu/drm/i915/display/intel_crtc.h | 7 + + drivers/gpu/drm/i915/display/intel_cursor.c | 69 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 348 ++-- + drivers/gpu/drm/i915/display/intel_ddi.h | 5 +- + drivers/gpu/drm/i915/display/intel_display.c | 1920 ++++---------------- + drivers/gpu/drm/i915/display/intel_display.h | 17 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 69 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 132 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 102 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 51 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 2 + + drivers/gpu/drm/i915/display/intel_dp.c | 163 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 60 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 43 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 32 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 7 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 2 +- + drivers/gpu/drm/i915/display/intel_dpt.c | 58 + + drivers/gpu/drm/i915/display/intel_dpt.h | 4 + + drivers/gpu/drm/i915/display/intel_dsb.c | 4 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 42 - + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 4 + + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 + + drivers/gpu/drm/i915/display/intel_dsi_vbt.h | 22 + + drivers/gpu/drm/i915/display/intel_fb.c | 706 +++++-- + drivers/gpu/drm/i915/display/intel_fb.h | 31 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 12 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 1000 +++++----- + drivers/gpu/drm/i915/display/intel_fbc.h | 11 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 136 +- + drivers/gpu/drm/i915/display/intel_fdi.h | 2 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 2 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 13 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 117 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 42 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 501 +++++ + drivers/gpu/drm/i915/display/intel_pch_display.h | 27 + + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 648 +++++++ + drivers/gpu/drm/i915/display/intel_pch_refclk.h | 21 + + drivers/gpu/drm/i915/display/intel_psr.c | 125 +- + drivers/gpu/drm/i915/display/intel_psr.h | 3 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 257 +-- + drivers/gpu/drm/i915/display/intel_sprite.h | 4 - + drivers/gpu/drm/i915/display/intel_vdsc.c | 65 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 10 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 18 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 1 + + drivers/gpu/drm/i915/display/skl_scaler.c | 1 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 462 +++-- + drivers/gpu/drm/i915/display/vlv_dsi.c | 8 + + drivers/gpu/drm/i915/display/vlv_dsi.h | 19 + + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 1 + + drivers/gpu/drm/i915/display/vlv_dsi_pll.h | 38 + + drivers/gpu/drm/i915/gem/i915_gem_busy.c | 35 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 96 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 266 ++- + drivers/gpu/drm/i915/gt/intel_gt.c | 2 + + drivers/gpu/drm/i915/gt/intel_gtt.h | 2 + + drivers/gpu/drm/i915/{i915_drv.c => i915_driver.c} | 43 +- + drivers/gpu/drm/i915/i915_driver.h | 24 + + drivers/gpu/drm/i915/i915_drv.h | 75 +- + drivers/gpu/drm/i915/i915_iosf_mbi.h | 42 + + drivers/gpu/drm/i915/i915_irq.c | 2 +- + drivers/gpu/drm/i915/i915_module.c | 4 +- + drivers/gpu/drm/i915/i915_pci.c | 22 +- + drivers/gpu/drm/i915/i915_reg.h | 358 ++-- + drivers/gpu/drm/i915/i915_request.c | 57 +- + drivers/gpu/drm/i915/i915_request.h | 5 + + drivers/gpu/drm/i915/i915_sw_fence.c | 53 +- + drivers/gpu/drm/i915/i915_switcheroo.c | 5 +- + drivers/gpu/drm/i915/i915_trace.h | 75 +- + drivers/gpu/drm/i915/i915_vma_types.h | 19 +- + drivers/gpu/drm/i915/intel_pm.c | 41 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 + + drivers/gpu/drm/i915/intel_uncore.c | 2 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 3 +- + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 6 +- + drivers/gpu/drm/i915/vlv_sideband.c | 3 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 283 ++- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 127 +- + drivers/gpu/drm/kmb/kmb_drv.c | 4 + + drivers/gpu/drm/lima/lima_device.c | 1 + + drivers/gpu/drm/lima/lima_gem.c | 18 +- + drivers/gpu/drm/lima/lima_sched.c | 4 +- + drivers/gpu/drm/meson/Kconfig | 2 + + drivers/gpu/drm/meson/Makefile | 3 +- + drivers/gpu/drm/meson/meson_drv.c | 71 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 342 +--- + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 284 +++ + .../{meson_venc_cvbs.h => meson_encoder_cvbs.h} | 2 +- + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 447 +++++ + drivers/gpu/drm/meson/meson_encoder_hdmi.h | 12 + + drivers/gpu/drm/meson/meson_venc_cvbs.c | 293 --- + drivers/gpu/drm/mgag200/mgag200_mode.c | 4 +- + drivers/gpu/drm/msm/dsi/dsi.c | 48 +- + drivers/gpu/drm/msm/dsi/dsi.h | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 22 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 6 +- + drivers/gpu/drm/msm/msm_drv.h | 2 + + drivers/gpu/drm/msm/msm_gem.c | 29 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 4 +- + drivers/gpu/drm/nouveau/dispnv50/Kbuild | 1 + + drivers/gpu/drm/nouveau/dispnv50/base907c.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/corec57d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/crc.c | 64 +- + drivers/gpu/drm/nouveau/dispnv50/crc.h | 7 +- + drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 8 +- + drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 45 +- + drivers/gpu/drm/nouveau/dispnv50/crcc37d.h | 40 + + drivers/gpu/drm/nouveau/dispnv50/crcc57d.c | 58 + + drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 15 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 38 +- + drivers/gpu/drm/nouveau/dispnv50/head.h | 2 + + drivers/gpu/drm/nouveau/dispnv50/head907d.c | 6 + + drivers/gpu/drm/nouveau/dispnv50/head917d.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 3 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 15 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.h | 4 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 7 +- + .../gpu/drm/nouveau/include/nvhw/class/cl907d.h | 3 + + .../gpu/drm/nouveau/include/nvhw/class/clc57d.h | 69 + + drivers/gpu/drm/nouveau/nouveau_backlight.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 48 +- + drivers/gpu/drm/nouveau/nvkm/core/client.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 4 +- + .../gpu/drm/nouveau/nvkm/engine/disp/coregv100.c | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/falcon/base.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 2 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/mcp89.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 37 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm200.c | 31 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 2 + + drivers/gpu/drm/omapdrm/dss/dispc.c | 9 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 10 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 7 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c | 14 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_cec.h | 14 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 4 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 5 +- + drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 5 +- + drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 4 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 7 +- + drivers/gpu/drm/omapdrm/dss/video-pll.c | 8 +- + drivers/gpu/drm/omapdrm/omap_dmm_priv.h | 10 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 10 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 10 +- + drivers/gpu/drm/omapdrm/tcm-sita.c | 10 +- + drivers/gpu/drm/panel/Kconfig | 41 + + drivers/gpu/drm/panel/Makefile | 4 + + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 14 +- + drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 445 +++++ + drivers/gpu/drm/panel/panel-dsi-cm.c | 4 +- + drivers/gpu/drm/panel/panel-edp.c | 4 +- + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 13 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 29 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 265 ++- + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 14 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 10 +- + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 323 ++++ + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 8 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 8 +- + drivers/gpu/drm/panel/panel-lvds.c | 18 +- + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 702 +++++++ + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 10 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 20 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 8 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 8 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 21 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 1 + + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 17 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 21 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 8 +- + drivers/gpu/drm/panel/panel-simple.c | 56 + + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 552 ++++++ + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 14 +- + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 25 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 20 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 6 +- + drivers/gpu/drm/radeon/radeon_sync.c | 22 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 13 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 82 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 13 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 44 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 7 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +- + drivers/gpu/drm/scheduler/sched_entity.c | 15 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- + drivers/gpu/drm/tidss/tidss_drv.c | 11 +- + drivers/gpu/drm/tiny/Kconfig | 13 + + drivers/gpu/drm/tiny/Makefile | 1 + + drivers/gpu/drm/tiny/cirrus.c | 24 +- + drivers/gpu/drm/tiny/ili9163.c | 225 +++ + drivers/gpu/drm/tiny/repaper.c | 2 +- + drivers/gpu/drm/tiny/simpledrm.c | 37 +- + drivers/gpu/drm/tiny/st7586.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 + + drivers/gpu/drm/v3d/v3d_bo.c | 22 +- + drivers/gpu/drm/v3d/v3d_gem.c | 4 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 91 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 7 +- + drivers/gpu/drm/vc4/vc4_drv.h | 37 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 630 +++++-- + drivers/gpu/drm/vc4/vc4_hdmi.h | 37 + + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 37 + + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 8 + + drivers/gpu/drm/vc4/vc4_hvs.c | 26 +- + drivers/gpu/drm/vc4/vc4_kms.c | 131 +- + drivers/gpu/drm/vc4/vc4_plane.c | 5 - + drivers/gpu/drm/vc4/vc4_txp.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 27 +- + drivers/gpu/drm/xen/xen_drm_front.c | 16 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 108 +- + drivers/gpu/drm/xen/xen_drm_front_gem.h | 7 - + drivers/platform/x86/Kconfig | 2 + + drivers/platform/x86/thinkpad_acpi.c | 137 +- + drivers/pwm/core.c | 26 + + drivers/pwm/pwm-pxa.c | 16 +- + drivers/video/fbdev/core/fbsysfs.c | 14 +- + drivers/video/fbdev/omap/omapfb_main.c | 1 + + .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 14 +- + .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 18 +- + .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 20 +- + drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c | 12 +- + include/drm/drm_connector.h | 55 + + include/drm/drm_dp_helper.h | 28 +- + include/drm/drm_drv.h | 11 +- + include/drm/drm_format_helper.h | 58 +- + include/drm/drm_gem_atomic_helper.h | 18 + + include/drm/drm_gem_shmem_helper.h | 168 +- + include/drm/drm_mode_config.h | 13 + + include/drm/drm_of.h | 7 + + include/drm/drm_privacy_screen_consumer.h | 65 + + include/drm/drm_privacy_screen_driver.h | 84 + + include/drm/drm_privacy_screen_machine.h | 46 + + include/drm/drm_probe_helper.h | 1 + + include/drm/drm_sysfs.h | 1 + + include/drm/gpu_scheduler.h | 12 +- + include/drm/intel-gtt.h | 8 +- + include/linux/dma-buf.h | 4 +- + include/linux/dma-fence.h | 1 + + include/linux/dma-resv.h | 27 +- + include/linux/pwm.h | 2 + + 358 files changed, 15870 insertions(+), 7454 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ptn3460.txt + delete mode 100644 Documentation/devicetree/bindings/display/bridge/sii9234.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/sil,sii9234.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,bf060y8m-aj0.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9163.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt35950.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sony,tulip-truly-nt35521.yaml + create mode 100644 drivers/dma-buf/st-dma-resv.c + create mode 100644 drivers/gpu/drm/drm_privacy_screen.c + create mode 100644 drivers/gpu/drm/drm_privacy_screen_x86.c + create mode 100644 drivers/gpu/drm/i915/display/icl_dsi.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dsi_vbt.h + create mode 100644 drivers/gpu/drm/i915/display/intel_pch_display.c + create mode 100644 drivers/gpu/drm/i915/display/intel_pch_display.h + create mode 100644 drivers/gpu/drm/i915/display/intel_pch_refclk.c + create mode 100644 drivers/gpu/drm/i915/display/intel_pch_refclk.h + create mode 100644 drivers/gpu/drm/i915/display/vlv_dsi.h + create mode 100644 drivers/gpu/drm/i915/display/vlv_dsi_pll.h + rename drivers/gpu/drm/i915/{i915_drv.c => i915_driver.c} (97%) + create mode 100644 drivers/gpu/drm/i915/i915_driver.h + create mode 100644 drivers/gpu/drm/i915/i915_iosf_mbi.h + create mode 100644 drivers/gpu/drm/meson/meson_encoder_cvbs.c + rename drivers/gpu/drm/meson/{meson_venc_cvbs.h => meson_encoder_cvbs.h} (92%) + create mode 100644 drivers/gpu/drm/meson/meson_encoder_hdmi.c + create mode 100644 drivers/gpu/drm/meson/meson_encoder_hdmi.h + delete mode 100644 drivers/gpu/drm/meson/meson_venc_cvbs.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crcc37d.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crcc57d.c + create mode 100644 drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c + create mode 100644 drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt35950.c + create mode 100644 drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c + create mode 100644 drivers/gpu/drm/tiny/ili9163.c + create mode 100644 include/drm/drm_privacy_screen_consumer.h + create mode 100644 include/drm/drm_privacy_screen_driver.h + create mode 100644 include/drm/drm_privacy_screen_machine.h +Merging drm-misc/for-linux-next (4ff22f487f8c drm: Return error codes from struct drm_driver.gem_create_object) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/video/console/vgacon.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.c +Auto-merging drivers/gpu/drm/vc4/vc4_bo.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/sun4i/Kconfig +Auto-merging drivers/gpu/drm/i915/i915_module.c +Removing drivers/gpu/drm/i915/dma_resv_utils.h +Removing drivers/gpu/drm/i915/dma_resv_utils.c +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/drm_gem_cma_helper.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 7 + + Documentation/gpu/todo.rst | 11 + + drivers/dma-buf/dma-resv.c | 3 +- + drivers/gpu/drm/Kconfig | 13 +- + drivers/gpu/drm/Makefile | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 9 - + drivers/gpu/drm/arm/Kconfig | 2 - + drivers/gpu/drm/arm/display/Kconfig | 1 - + drivers/gpu/drm/aspeed/Kconfig | 1 - + drivers/gpu/drm/ast/ast_drv.c | 3 +- + drivers/gpu/drm/atmel-hlcdc/Kconfig | 1 - + drivers/gpu/drm/bridge/analogix/anx7625.c | 6 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 4 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 40 +++- + drivers/gpu/drm/drm_atomic.c | 180 ++++++++------- + drivers/gpu/drm/drm_atomic_helper.c | 243 ++++++++++++--------- + drivers/gpu/drm/drm_atomic_uapi.c | 2 +- + drivers/gpu/drm/drm_auth.c | 12 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 90 ++++---- + drivers/gpu/drm/drm_gem_shmem_helper.c | 17 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 4 +- + drivers/gpu/drm/drm_hashtab.c | 10 +- + drivers/gpu/drm/drm_legacy.h | 40 +++- + drivers/gpu/drm/drm_mipi_dbi.c | 34 ++- + drivers/gpu/drm/drm_nomodeset.c | 24 ++ + drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 + + drivers/gpu/drm/fsl-dcu/Kconfig | 1 - + drivers/gpu/drm/hisilicon/kirin/Kconfig | 1 - + drivers/gpu/drm/i915/Makefile | 1 - + drivers/gpu/drm/i915/dma_resv_utils.c | 17 -- + drivers/gpu/drm/i915/dma_resv_utils.h | 13 -- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 3 - + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 8 - + drivers/gpu/drm/i915/i915_module.c | 4 +- + drivers/gpu/drm/imx/Kconfig | 2 +- + drivers/gpu/drm/imx/dcss/Kconfig | 2 +- + drivers/gpu/drm/ingenic/Kconfig | 1 - + drivers/gpu/drm/kmb/Kconfig | 1 - + drivers/gpu/drm/lima/lima_gem.c | 2 +- + drivers/gpu/drm/mcde/Kconfig | 1 - + drivers/gpu/drm/meson/Kconfig | 1 - + drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +- + drivers/gpu/drm/mxsfb/Kconfig | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 4 +- + drivers/gpu/drm/panel/Kconfig | 2 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- + drivers/gpu/drm/pl111/Kconfig | 1 - + drivers/gpu/drm/qxl/qxl_debugfs.c | 17 +- + drivers/gpu/drm/qxl/qxl_drv.c | 3 +- + drivers/gpu/drm/radeon/radeon_drv.c | 9 +- + drivers/gpu/drm/rcar-du/Kconfig | 1 - + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 10 +- + drivers/gpu/drm/shmobile/Kconfig | 1 - + drivers/gpu/drm/sti/Kconfig | 1 - + drivers/gpu/drm/stm/Kconfig | 1 - + drivers/gpu/drm/sun4i/Kconfig | 1 - + drivers/gpu/drm/tidss/Kconfig | 1 - + drivers/gpu/drm/tidss/tidss_drv.c | 2 +- + drivers/gpu/drm/tilcdc/Kconfig | 1 - + drivers/gpu/drm/tiny/Kconfig | 20 +- + drivers/gpu/drm/tiny/bochs.c | 3 +- + drivers/gpu/drm/tiny/cirrus.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo.c | 1 - + drivers/gpu/drm/ttm/ttm_range_manager.c | 11 +- + drivers/gpu/drm/tve200/Kconfig | 1 - + drivers/gpu/drm/v3d/v3d_bo.c | 4 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +- + drivers/gpu/drm/vboxvideo/vbox_main.c | 4 +- + drivers/gpu/drm/vc4/Kconfig | 1 - + drivers/gpu/drm/vc4/vc4_bo.c | 8 +- + drivers/gpu/drm/vgem/vgem_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 2 +- + drivers/gpu/drm/vmwgfx/Makefile | 4 +- + drivers/gpu/drm/vmwgfx/ttm_memory.c | 99 +-------- + drivers/gpu/drm/vmwgfx/ttm_memory.h | 6 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 52 ++--- + drivers/gpu/drm/vmwgfx/ttm_object.h | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 7 + + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 24 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 45 ++-- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_hashtab.c | 199 +++++++++++++++++ + .../gpu/drm/vmwgfx/vmwgfx_hashtab.h | 54 ++--- + drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c | 90 ++++++++ + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 58 +++-- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 7 +- + drivers/gpu/drm/xlnx/Kconfig | 1 - + drivers/video/console/vgacon.c | 21 -- + include/drm/drm_device.h | 5 +- + include/drm/drm_drv.h | 6 +- + include/drm/drm_gem_cma_helper.h | 189 +++++++++++----- + include/drm/drm_legacy.h | 15 +- + include/drm/ttm/ttm_bo_api.h | 1 - + include/drm/ttm/ttm_placement.h | 11 + + include/linux/console.h | 6 - + 100 files changed, 1142 insertions(+), 772 deletions(-) + create mode 100644 drivers/gpu/drm/drm_nomodeset.c + delete mode 100644 drivers/gpu/drm/i915/dma_resv_utils.c + delete mode 100644 drivers/gpu/drm/i915/dma_resv_utils.h + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_hashtab.c + rename include/drm/drm_hashtab.h => drivers/gpu/drm/vmwgfx/vmwgfx_hashtab.h (58%) + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c +Merging amdgpu/drm-next (ee641f210a83 drm/amdgpu: bump driver version for PROFILE IOCTL) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc_link.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/navi10_ih.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/nv.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3acf52ccd008] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 134 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 96 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 18 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 126 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 143 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 128 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 124 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 128 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 208 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 388 ---- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 20 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_profile.c | 112 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_profile.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h | 5 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 - + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 2 - + drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 161 ++ + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 1 + + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 1 + + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 54 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 148 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 932 +++------- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 116 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 31 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 35 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 61 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 59 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 98 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 46 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 273 ++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 3 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 44 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 15 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 6 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 2 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 3 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 8 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h | 7 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 66 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 99 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 475 ++++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c | 20 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 53 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 70 +- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 10 +- + drivers/gpu/drm/amd/display/dc/dc.h | 27 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 37 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 31 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 12 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 6 - + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 2 + + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 5 +- + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 3 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 14 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 2 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 43 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 14 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 82 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 5 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 20 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 15 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 14 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 3 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 + + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 2 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 39 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 1 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 23 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 20 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 19 +- + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 43 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 5 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 1 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 11 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 + + drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c | 1889 ++++++++++++++++++++ + .../amd/display/dc/dml/dml_wrapper_translation.c | 284 +++ + .../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 33 +- + .../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.h | 4 - + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 14 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 28 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 1 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 6 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dml_wrapper.h | 34 + + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 3 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 4 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 11 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 42 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 30 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 89 +- + .../drm/amd/display/include/ddc_service_types.h | 4 + + drivers/gpu/drm/amd/display/include/logger_types.h | 4 - + .../drm/amd/include/asic_reg/mp/mp_11_0_offset.h | 7 + + .../drm/amd/include/asic_reg/mp/mp_11_0_sh_mask.h | 12 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 57 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 4 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 12 + + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 24 + + .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 18 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 5 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 9 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 14 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 12 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 132 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 10 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 87 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 14 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 109 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 23 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 6 +- + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 + + drivers/gpu/drm/radeon/radeon_kms.c | 38 +- + include/uapi/drm/amdgpu_drm.h | 28 + + include/uapi/linux/kfd_sysfs.h | 108 ++ + 189 files changed, 6082 insertions(+), 3013 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_profile.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_profile.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_wrapper_translation.c + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/dml_wrapper.h + create mode 100644 include/uapi/linux/kfd_sysfs.h +$ git am -3 ../patches/0001-fix-up-for-drm-amdgpu-cancel-the-correct-hrtimer-on-.patch +Applying: fix up for "drm/amdgpu: cancel the correct hrtimer on exit" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +$ git add -A . +$ git commit -v -a --amend +[master 93cc2e24e4e7] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux + Date: Mon Dec 6 12:27:30 2021 +1100 +Merging drm-intel/for-linux-next (dfb924e33927 drm/i915/adlp: Remove require_force_probe protection) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_atomic_plane.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/i9xx_plane.c | 15 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 2 +- + drivers/gpu/drm/i915/display/intel_bios.c | 14 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 4 +- + drivers/gpu/drm/i915/display/intel_crt.c | 6 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 42 + + drivers/gpu/drm/i915/display/intel_crtc.h | 10 + + drivers/gpu/drm/i915/display/intel_display.c | 73 +- + drivers/gpu/drm/i915/display/intel_display.h | 24 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 54 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 76 +- + drivers/gpu/drm/i915/display/intel_dp.c | 2 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 1 + + .../gpu/drm/i915/display/intel_dp_link_training.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 2 +- + drivers/gpu/drm/i915/display/intel_dsi.c | 2 + + drivers/gpu/drm/i915/display/intel_fb.c | 11 + + drivers/gpu/drm/i915/display/intel_fb.h | 2 + + drivers/gpu/drm/i915/display/intel_fb_pin.c | 10 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 1175 ++++++++++---------- + drivers/gpu/drm/i915/display/intel_fbc.h | 13 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 4 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 12 +- + drivers/gpu/drm/i915/display/intel_plane_initial.c | 5 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 1 + + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 30 +- + drivers/gpu/drm/i915/display/intel_tv.c | 7 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 7 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 2 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 61 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 4 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 2 +- + drivers/gpu/drm/i915/i915_drv.h | 191 +--- + drivers/gpu/drm/i915/i915_irq.c | 6 +- + drivers/gpu/drm/i915/i915_pci.c | 1 - + drivers/gpu/drm/i915/i915_reg.h | 39 +- + drivers/gpu/drm/i915/i915_trace.h | 22 +- + drivers/gpu/drm/i915/intel_pm.c | 25 +- + drivers/gpu/drm/i915/intel_pm_types.h | 76 ++ + 40 files changed, 1001 insertions(+), 1036 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_pm_types.h +Merging drm-intel-gt/for-linux-next-gt (8722ded49ce8 drm/i915: Fix error pointer dereference in i915_gem_do_execbuffer()) +$ 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/intel_uncore.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_vma_types.h +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gtt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_pm.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_wait.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shrinker.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_bw.c +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/i915/display/intel_fbc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9ad70e4f087c] Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + drivers/dma-buf/dma-fence-array.c | 6 +- + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/display/intel_bw.c | 2 +- + drivers/gpu/drm/i915/display/intel_display.c | 4 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 18 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 22 + + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 142 +++- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 44 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 75 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 40 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 46 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 18 +- + drivers/gpu/drm/i915/gem/i915_gem_region.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 195 +++-- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 94 ++- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 765 +++++++++--------- + drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 41 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 874 +++++++++++++++++++++ + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.h | 41 + + drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c | 3 + + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gemfs.c | 5 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 130 +-- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 4 +- + .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 24 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 135 ++-- + drivers/gpu/drm/i915/gt/gen6_ppgtt.h | 2 - + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 5 +- + drivers/gpu/drm/i915/gt/intel_context.c | 16 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 36 +- + drivers/gpu/drm/i915/gt/intel_engine_stats.h | 33 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 83 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 37 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 3 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 5 + + drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 15 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 12 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 29 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 72 ++ + drivers/gpu/drm/i915/gt/intel_rps.h | 3 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 495 +++++++++++- + drivers/gpu/drm/i915/gt/mock_engine.c | 38 +- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 35 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 20 +- + drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 30 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 21 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h | 5 + + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 13 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 155 +++- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 13 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 290 +++++++ + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 2 + + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 18 +- + drivers/gpu/drm/i915/i915_drv.h | 83 +- + drivers/gpu/drm/i915/i915_gem.c | 5 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 233 ++++-- + drivers/gpu/drm/i915/i915_gpu_error.h | 4 +- + drivers/gpu/drm/i915/i915_irq.c | 26 +- + drivers/gpu/drm/i915/i915_pci.c | 18 +- + drivers/gpu/drm/i915/i915_reg.h | 156 +++- + drivers/gpu/drm/i915/i915_request.c | 69 +- + drivers/gpu/drm/i915/i915_request.h | 20 +- + drivers/gpu/drm/i915/i915_scatterlist.c | 62 +- + drivers/gpu/drm/i915/i915_scatterlist.h | 76 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 28 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 23 +- + drivers/gpu/drm/i915/i915_sw_fence_work.c | 2 +- + drivers/gpu/drm/i915/i915_sysfs.c | 19 +- + drivers/gpu/drm/i915/i915_vma.c | 98 ++- + drivers/gpu/drm/i915/i915_vma.h | 9 +- + 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 | 1 - + drivers/gpu/drm/i915/intel_device_info.c | 33 +- + drivers/gpu/drm/i915/intel_device_info.h | 12 +- + drivers/gpu/drm/i915/intel_memory_region.c | 26 +- + drivers/gpu/drm/i915/intel_memory_region.h | 9 +- + drivers/gpu/drm/i915/intel_pm.c | 39 +- + drivers/gpu/drm/i915/intel_region_ttm.c | 50 +- + drivers/gpu/drm/i915/intel_region_ttm.h | 7 +- + drivers/gpu/drm/i915/intel_step.c | 77 +- + drivers/gpu/drm/i915/intel_step.h | 3 +- + drivers/gpu/drm/i915/intel_uncore.c | 17 +- + drivers/gpu/drm/i915/intel_uncore.h | 2 + + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 19 + + drivers/gpu/drm/i915/selftests/i915_request.c | 14 +- + drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 2 +- + drivers/gpu/drm/i915/selftests/igt_reset.c | 2 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 8 +- + drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 8 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 4 +- + drivers/gpu/drm/i915/selftests/mock_region.c | 19 +- + 105 files changed, 4510 insertions(+), 1288 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm_move.h + create mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.c + create mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.h +Merging drm-tegra/drm/tegra/for-next (cef3fb370da3 drm/tegra: Mark nvdec PM functions as __maybe_unused) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/plane.c +Auto-merging drivers/gpu/drm/tegra/gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/gem.c +Resolved 'drivers/gpu/drm/tegra/gem.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8e15875bcaab] Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/tegra/Makefile | 3 +- + drivers/gpu/drm/tegra/dc.c | 117 ++++++++-- + drivers/gpu/drm/tegra/dc.h | 1 + + drivers/gpu/drm/tegra/drm.c | 4 + + drivers/gpu/drm/tegra/drm.h | 1 + + drivers/gpu/drm/tegra/gem.c | 171 +++++++++------ + drivers/gpu/drm/tegra/gr2d.c | 33 ++- + drivers/gpu/drm/tegra/hub.h | 1 - + drivers/gpu/drm/tegra/nvdec.c | 471 +++++++++++++++++++++++++++++++++++++++++ + drivers/gpu/drm/tegra/plane.c | 65 ++---- + drivers/gpu/drm/tegra/plane.h | 2 +- + drivers/gpu/drm/tegra/rgb.c | 53 ++++- + drivers/gpu/drm/tegra/submit.c | 63 ++++-- + drivers/gpu/drm/tegra/uapi.c | 68 +++--- + drivers/gpu/drm/tegra/uapi.h | 5 +- + drivers/gpu/drm/tegra/vic.c | 8 + + drivers/gpu/host1x/Kconfig | 1 + + drivers/gpu/host1x/bus.c | 79 ++++++- + drivers/gpu/host1x/dev.c | 20 ++ + drivers/gpu/host1x/dev.h | 2 + + drivers/gpu/host1x/job.c | 160 +++++--------- + drivers/gpu/host1x/job.h | 6 +- + include/linux/host1x.h | 75 +++++-- + 23 files changed, 1088 insertions(+), 321 deletions(-) + create mode 100644 drivers/gpu/drm/tegra/nvdec.c +Merging drm-msm/msm-next (fee328076333 mailmap: add and update email addresses) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Auto-merging include/drm/drm_dp_helper.h +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Removing drivers/gpu/drm/msm/edp/edp_phy.c +Removing drivers/gpu/drm/msm/edp/edp_ctrl.c +Removing drivers/gpu/drm/msm/edp/edp_connector.c +Removing drivers/gpu/drm/msm/edp/edp_bridge.c +Removing drivers/gpu/drm/msm/edp/edp_aux.c +Removing drivers/gpu/drm/msm/edp/edp.xml.h +Removing drivers/gpu/drm/msm/edp/edp.h +Removing drivers/gpu/drm/msm/edp/edp.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_manager.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi.h +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/display/msm/edp.txt +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 8 + + .../bindings/display/msm/dp-controller.yaml | 2 + + .../devicetree/bindings/display/msm/edp.txt | 56 - + MAINTAINERS | 1 + + drivers/gpu/drm/msm/Makefile | 6 - + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 3 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 3 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 3 +- + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 16 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 25 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 15 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 10 - + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 95 ++ + drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 10 + + drivers/gpu/drm/msm/adreno/a6xx_hfi.h | 11 + + drivers/gpu/drm/msm/adreno/adreno_device.c | 4 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 5 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 11 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 18 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 3 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 17 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 18 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 304 +++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 2 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 19 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c | 24 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 23 +- + drivers/gpu/drm/msm/dp/dp_display.c | 15 +- + drivers/gpu/drm/msm/dp/dp_hpd.c | 2 - + drivers/gpu/drm/msm/dp/dp_hpd.h | 2 - + drivers/gpu/drm/msm/dsi/dsi.h | 4 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 47 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 14 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 11 - + drivers/gpu/drm/msm/edp/edp.c | 198 --- + drivers/gpu/drm/msm/edp/edp.h | 77 -- + drivers/gpu/drm/msm/edp/edp.xml.h | 388 ------ + drivers/gpu/drm/msm/edp/edp_aux.c | 265 ---- + drivers/gpu/drm/msm/edp/edp_bridge.c | 111 -- + drivers/gpu/drm/msm/edp/edp_connector.c | 132 -- + drivers/gpu/drm/msm/edp/edp_ctrl.c | 1373 -------------------- + drivers/gpu/drm/msm/edp/edp_phy.c | 98 -- + drivers/gpu/drm/msm/msm_debugfs.c | 52 +- + drivers/gpu/drm/msm/msm_drv.c | 17 +- + drivers/gpu/drm/msm/msm_drv.h | 23 +- + drivers/gpu/drm/msm/msm_fbdev.c | 13 +- + drivers/gpu/drm/msm/msm_fence.h | 12 + + drivers/gpu/drm/msm/msm_gpu.c | 22 +- + drivers/gpu/drm/msm/msm_gpu.h | 66 +- + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 91 +- + drivers/gpu/drm/msm/msm_kms.h | 3 + + drivers/gpu/drm/msm/msm_perf.c | 9 +- + drivers/gpu/drm/msm/msm_rd.c | 16 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 4 +- + include/drm/drm_dp_helper.h | 7 + + 62 files changed, 604 insertions(+), 3198 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/msm/edp.txt + delete mode 100644 drivers/gpu/drm/msm/edp/edp.c + delete mode 100644 drivers/gpu/drm/msm/edp/edp.h + delete mode 100644 drivers/gpu/drm/msm/edp/edp.xml.h + delete mode 100644 drivers/gpu/drm/msm/edp/edp_aux.c + delete mode 100644 drivers/gpu/drm/msm/edp/edp_bridge.c + delete mode 100644 drivers/gpu/drm/msm/edp/edp_connector.c + delete mode 100644 drivers/gpu/drm/msm/edp/edp_ctrl.c + delete mode 100644 drivers/gpu/drm/msm/edp/edp_phy.c +Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-tve.c | 4 +--- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 2 files changed, 4 insertions(+), 9 deletions(-) +Merging etnaviv/etnaviv/next (96894b795967 drm/etnaviv: constify static struct cooling_ops) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 41 ++++++++++++++++++++++++++--------- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 2 +- + 2 files changed, 32 insertions(+), 11 deletions(-) +Merging regmap/for-next (02d6fdecb9c3 regmap: allow to define reg_update_bits for no bus configuration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merging sound/for-next (1e583aef12aa ALSA: usb-audio: Drop superfluous '0' in Presonus Studio 1810c's ID) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/pci/hda/patch_hdmi.c +Auto-merging sound/pci/hda/hda_local.h +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging sound/hda/intel-dsp-config.c +Removing sound/core/sgbuf.c +Auto-merging sound/core/oss/pcm_oss.c +Merge made by the 'recursive' strategy. + include/sound/hda_codec.h | 8 +- + include/sound/intel-nhlt.h | 37 ++++-- + include/sound/memalloc.h | 14 +-- + sound/core/Makefile | 1 - + sound/core/control_led.c | 2 +- + sound/core/jack.c | 3 + + sound/core/memalloc.c | 53 ++++++++- + sound/core/oss/pcm_oss.c | 2 +- + sound/core/pcm.c | 6 +- + sound/core/sgbuf.c | 201 --------------------------------- + sound/hda/hdac_stream.c | 14 +-- + sound/hda/intel-dsp-config.c | 2 +- + sound/hda/intel-nhlt.c | 102 +++++++++++++++++ + sound/pci/hda/hda_bind.c | 7 ++ + sound/pci/hda/hda_codec.c | 45 +++++--- + sound/pci/hda/hda_controller.c | 1 - + sound/pci/hda/hda_intel.c | 6 +- + sound/pci/hda/hda_jack.c | 11 ++ + sound/pci/hda/hda_jack.h | 1 + + sound/pci/hda/hda_local.h | 1 + + sound/pci/hda/patch_hdmi.c | 2 +- + sound/soc/intel/skylake/skl-nhlt.c | 102 ----------------- + sound/soc/intel/skylake/skl-pcm.c | 4 +- + sound/soc/intel/skylake/skl-topology.c | 29 +++-- + sound/soc/intel/skylake/skl-topology.h | 1 + + sound/soc/intel/skylake/skl.h | 4 - + sound/usb/format.c | 2 +- + sound/usb/mixer.c | 1 + + sound/usb/mixer_maps.c | 17 ++- + sound/usb/mixer_quirks.c | 2 +- + sound/usb/quirks.c | 2 +- + 31 files changed, 302 insertions(+), 381 deletions(-) + delete mode 100644 sound/core/sgbuf.c +Merging sound-asoc/for-next (0695ad92fe1a ASoC: cs35l41: Fix undefined reference to core functions) +$ 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 sound/soc/codecs/wcd934x.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/wm8903.txt +Removing Documentation/devicetree/bindings/sound/cs42l42.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/cirrus,cs42l42.yaml | 225 +++++++ + .../devicetree/bindings/sound/cs42l42.txt | 115 ---- + .../devicetree/bindings/sound/nxp,tfa989x.yaml | 41 ++ + .../devicetree/bindings/sound/wlf,wm8903.yaml | 116 ++++ + Documentation/devicetree/bindings/sound/wm8903.txt | 82 --- + MAINTAINERS | 1 + + drivers/firmware/cirrus/cs_dsp.c | 142 +++-- + include/dt-bindings/sound/rt5640.h | 1 + + include/linux/firmware/cirrus/cs_dsp.h | 21 +- + include/linux/firmware/cirrus/wmfw.h | 1 + + include/sound/soc-component.h | 4 + + include/sound/soc-dai.h | 4 +- + include/sound/sof/dai-amd.h | 21 + + include/sound/sof/dai-mediatek.h | 23 + + include/sound/sof/dai.h | 35 +- + include/sound/sof/header.h | 1 + + include/uapi/sound/asound.h | 2 +- + include/uapi/sound/sof/tokens.h | 5 + + sound/core/pcm_lib.c | 17 + + sound/soc/amd/Kconfig | 8 +- + sound/soc/amd/Makefile | 2 + + sound/soc/amd/acp-config.c | 71 +++ + sound/soc/amd/acp-pcm-dma.c | 15 +- + sound/soc/amd/acp.h | 1 + + sound/soc/amd/mach-config.h | 28 + + sound/soc/codecs/Kconfig | 14 +- + sound/soc/codecs/Makefile | 6 +- + sound/soc/codecs/adau1701.c | 94 +-- + sound/soc/codecs/cs35l41-i2c.c | 15 - + sound/soc/codecs/cs35l41-spi.c | 16 - + sound/soc/codecs/cs35l41-tables.c | 137 ++++- + sound/soc/codecs/cs35l41.c | 314 +++++++++- + sound/soc/codecs/cs35l41.h | 27 +- + sound/soc/codecs/cs42l42.c | 94 +-- + sound/soc/codecs/cs42l42.h | 6 +- + sound/soc/codecs/jz4770.c | 9 + + sound/soc/codecs/rt5640.c | 106 +++- + sound/soc/codecs/tfa989x.c | 20 +- + sound/soc/codecs/tlv320aic31xx.c | 105 ++-- + sound/soc/codecs/tlv320aic31xx.h | 2 +- + sound/soc/codecs/wcd-mbhc-v2.c | 76 ++- + sound/soc/codecs/wcd934x.c | 6 +- + sound/soc/codecs/wm_adsp.c | 47 +- + sound/soc/fsl/fsl-asoc-card.c | 12 + + sound/soc/fsl/imx-hdmi.c | 2 + + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 14 +- + sound/soc/intel/boards/Kconfig | 20 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- + sound/soc/intel/boards/bytcht_nocodec.c | 2 +- + sound/soc/intel/boards/hda_dsp_common.c | 2 +- + sound/soc/intel/boards/sof_maxim_common.c | 180 ++++++ + sound/soc/intel/boards/sof_maxim_common.h | 16 + + sound/soc/intel/boards/sof_nau8825.c | 651 +++++++++++++++++++++ + sound/soc/intel/boards/sof_rt5682.c | 72 +++ + sound/soc/intel/boards/sof_sdw.c | 152 ++--- + sound/soc/intel/boards/sof_sdw_common.h | 7 +- + sound/soc/intel/boards/sof_sdw_rt715.c | 7 - + sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 7 - + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 48 ++ + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 2 - + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 2 - + sound/soc/mediatek/mt8173/mt8173-max98090.c | 2 - + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 - + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 - + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 - + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 2 - + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 2 - + sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 12 +- + .../mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c | 2 +- + .../mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c | 2 +- + sound/soc/qcom/Kconfig | 1 + + sound/soc/qcom/sc7180.c | 24 +- + sound/soc/qcom/sdm845.c | 10 +- + sound/soc/soc-component.c | 28 + + sound/soc/soc-dai.c | 40 +- + sound/soc/soc-pcm.c | 29 +- + sound/soc/sof/Kconfig | 16 +- + sound/soc/sof/Makefile | 4 +- + sound/soc/sof/amd/Kconfig | 33 ++ + sound/soc/sof/amd/Makefile | 11 + + sound/soc/sof/amd/acp-dsp-offset.h | 78 +++ + sound/soc/sof/amd/acp-ipc.c | 187 ++++++ + sound/soc/sof/amd/acp-loader.c | 199 +++++++ + sound/soc/sof/amd/acp-pcm.c | 82 +++ + sound/soc/sof/amd/acp-stream.c | 181 ++++++ + sound/soc/sof/amd/acp-trace.c | 84 +++ + sound/soc/sof/amd/acp.c | 446 ++++++++++++++ + sound/soc/sof/amd/acp.h | 226 +++++++ + sound/soc/sof/amd/pci-rn.c | 165 ++++++ + sound/soc/sof/amd/renoir.c | 185 ++++++ + sound/soc/sof/core.c | 16 +- + sound/soc/sof/debug.c | 107 ++++ + sound/soc/sof/imx/Kconfig | 46 +- + sound/soc/sof/imx/imx-common.c | 24 + + sound/soc/sof/imx/imx-common.h | 11 + + sound/soc/sof/imx/imx8.c | 175 ++++-- + sound/soc/sof/imx/imx8m.c | 227 +++++-- + sound/soc/sof/intel/apl.c | 6 +- + sound/soc/sof/intel/atom.c | 43 +- + sound/soc/sof/intel/bdw.c | 52 +- + sound/soc/sof/intel/byt.c | 9 + + sound/soc/sof/intel/cnl.c | 6 +- + sound/soc/sof/intel/hda-dai.c | 76 ++- + sound/soc/sof/intel/hda-dsp.c | 52 +- + sound/soc/sof/intel/hda-ipc.c | 29 +- + sound/soc/sof/intel/hda-loader.c | 24 +- + sound/soc/sof/intel/hda-pcm.c | 41 +- + sound/soc/sof/intel/hda-stream.c | 83 ++- + sound/soc/sof/intel/hda.c | 38 +- + sound/soc/sof/intel/hda.h | 8 +- + sound/soc/sof/intel/icl.c | 6 +- + sound/soc/sof/intel/pci-tng.c | 9 + + sound/soc/sof/intel/shim.h | 7 + + sound/soc/sof/intel/tgl.c | 47 +- + sound/soc/sof/ipc.c | 78 ++- + sound/soc/sof/mediatek/Kconfig | 33 ++ + sound/soc/sof/mediatek/Makefile | 2 + + sound/soc/sof/mediatek/adsp_helper.h | 49 ++ + sound/soc/sof/mediatek/mediatek-ops.h | 8 + + sound/soc/sof/mediatek/mt8195/Makefile | 3 + + sound/soc/sof/mediatek/mt8195/mt8195-clk.c | 158 +++++ + sound/soc/sof/mediatek/mt8195/mt8195-clk.h | 28 + + sound/soc/sof/mediatek/mt8195/mt8195-loader.c | 56 ++ + sound/soc/sof/mediatek/mt8195/mt8195.c | 438 ++++++++++++++ + sound/soc/sof/mediatek/mt8195/mt8195.h | 158 +++++ + sound/soc/sof/ops.h | 81 ++- + sound/soc/sof/pcm.c | 98 +++- + sound/soc/sof/sof-audio.c | 197 ++++++- + sound/soc/sof/sof-audio.h | 10 +- + sound/soc/sof/sof-of-dev.c | 13 + + sound/soc/sof/sof-pci-dev.c | 19 +- + sound/soc/sof/sof-priv.h | 34 +- + sound/soc/sof/topology.c | 270 +++++---- + sound/soc/sof/trace.c | 18 + + sound/soc/stm/stm32_adfsdm.c | 5 +- + sound/soc/stm/stm32_i2s.c | 4 + + sound/soc/stm/stm32_sai_sub.c | 4 +- + sound/soc/stm/stm32_spdifrx.c | 4 + + sound/soc/sunxi/sun4i-spdif.c | 115 ++++ + sound/soc/sunxi/sun8i-codec.c | 56 ++ + sound/soc/tegra/tegra210_mvc.c | 209 +++++-- + sound/soc/tegra/tegra210_mvc.h | 5 + + sound/soc/uniphier/Kconfig | 2 - + 144 files changed, 7415 insertions(+), 1215 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs42l42.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/cs42l42.txt + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8903.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8903.txt + create mode 100644 include/sound/sof/dai-amd.h + create mode 100644 include/sound/sof/dai-mediatek.h + create mode 100644 sound/soc/amd/acp-config.c + create mode 100644 sound/soc/amd/mach-config.h + create mode 100644 sound/soc/intel/boards/sof_nau8825.c + create mode 100644 sound/soc/sof/amd/Kconfig + create mode 100644 sound/soc/sof/amd/Makefile + create mode 100644 sound/soc/sof/amd/acp-dsp-offset.h + create mode 100644 sound/soc/sof/amd/acp-ipc.c + create mode 100644 sound/soc/sof/amd/acp-loader.c + create mode 100644 sound/soc/sof/amd/acp-pcm.c + create mode 100644 sound/soc/sof/amd/acp-stream.c + create mode 100644 sound/soc/sof/amd/acp-trace.c + create mode 100644 sound/soc/sof/amd/acp.c + create mode 100644 sound/soc/sof/amd/acp.h + create mode 100644 sound/soc/sof/amd/pci-rn.c + create mode 100644 sound/soc/sof/amd/renoir.c + create mode 100644 sound/soc/sof/mediatek/Kconfig + create mode 100644 sound/soc/sof/mediatek/Makefile + create mode 100644 sound/soc/sof/mediatek/adsp_helper.h + create mode 100644 sound/soc/sof/mediatek/mediatek-ops.h + create mode 100644 sound/soc/sof/mediatek/mt8195/Makefile + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195-clk.c + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195-clk.h + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195-loader.c + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195.c + create mode 100644 sound/soc/sof/mediatek/mt8195/mt8195.h +Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules/modules-next +Already up to date. +Merging input/next (fafc66387dc0 Input: wacom_i2c - clean up the query device fields) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'recursive' strategy. + drivers/input/misc/palmas-pwrbutton.c | 5 ++-- + drivers/input/touchscreen/wacom_i2c.c | 44 +++++++++++++++++++++-------------- + 2 files changed, 29 insertions(+), 20 deletions(-) +Merging block/for-next (779d83b81f10 Merge branch 'for-5.17/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging include/linux/fs.h +Auto-merging drivers/block/loop.c +Auto-merging block/fops.c +Removing block/blk-exec.c +Merge made by the 'recursive' strategy. + Documentation/core-api/kernel-api.rst | 3 - + .../translations/zh_CN/core-api/kernel-api.rst | 2 - + block/Makefile | 2 +- + block/bdev.c | 12 +- + block/bfq-iosched.c | 304 ++++--- + block/bfq-iosched.h | 35 +- + block/blk-cgroup.c | 1 + + block/blk-core.c | 377 +-------- + block/blk-crypto-profile.c | 5 - + block/blk-exec.c | 116 --- + block/blk-flush.c | 18 +- + block/blk-integrity.c | 2 +- + block/blk-ioc.c | 116 ++- + block/blk-ioprio.c | 13 +- + block/blk-merge.c | 18 +- + block/blk-mq-debugfs.c | 5 +- + block/blk-mq-sched.c | 29 +- + block/blk-mq-sched.h | 2 - + block/blk-mq-sysfs.c | 2 - + block/blk-mq-tag.c | 2 +- + block/blk-mq.c | 895 +++++++++++++-------- + block/blk-mq.h | 19 +- + block/blk-stat.c | 18 + + block/blk-stat.h | 1 + + block/blk-sysfs.c | 9 +- + block/blk-throttle.c | 1 + + block/blk.h | 109 +-- + block/bsg-lib.c | 2 +- + block/elevator.c | 10 +- + block/fops.c | 37 +- + block/genhd.c | 45 +- + block/ioctl.c | 31 +- + block/partitions/core.c | 24 +- + drivers/block/amiflop.c | 3 +- + drivers/block/ataflop.c | 7 +- + drivers/block/brd.c | 1 - + drivers/block/drbd/drbd_main.c | 1 + + drivers/block/floppy.c | 13 +- + drivers/block/loop.c | 64 +- + drivers/block/mtip32xx/mtip32xx.c | 2 +- + drivers/block/n64cart.c | 2 +- + drivers/block/null_blk/main.c | 11 +- + drivers/block/null_blk/trace.h | 2 +- + drivers/block/paride/pcd.c | 5 +- + drivers/block/paride/pd.c | 6 +- + drivers/block/paride/pf.c | 5 +- + drivers/block/pktcdvd.c | 4 +- + drivers/block/ps3vram.c | 1 + + drivers/block/rbd.c | 6 +- + drivers/block/rnbd/rnbd-clt.c | 4 +- + drivers/block/sunvdc.c | 19 +- + drivers/block/swim.c | 1 + + drivers/block/swim3.c | 2 +- + drivers/block/sx8.c | 4 +- + drivers/block/virtio_blk.c | 3 +- + drivers/block/xen-blkback/xenbus.c | 2 +- + drivers/block/xen-blkfront.c | 26 +- + drivers/block/z2ram.c | 1 + + drivers/block/zram/zram_drv.c | 1 + + drivers/cdrom/gdrom.c | 1 + + drivers/infiniband/hw/qib/qib_verbs.c | 4 +- + drivers/md/dm-mpath.c | 1 - + drivers/md/dm.c | 1 + + drivers/md/md.c | 5 - + drivers/mmc/core/block.c | 38 +- + drivers/mtd/mtd_blkdevs.c | 20 +- + drivers/mtd/ubi/block.c | 7 +- + drivers/nvme/host/core.c | 4 +- + drivers/nvme/host/fault_inject.c | 2 +- + drivers/nvme/host/pci.c | 7 +- + drivers/nvme/host/trace.h | 6 +- + drivers/nvme/target/passthru.c | 3 +- + drivers/scsi/ch.c | 2 +- + drivers/scsi/scsi_bsg.c | 2 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/scsi/scsi_ioctl.c | 43 +- + drivers/scsi/scsi_lib.c | 47 +- + drivers/scsi/scsi_logging.c | 4 +- + drivers/scsi/sd.c | 27 +- + drivers/scsi/sd_zbc.c | 8 +- + drivers/scsi/sg.c | 6 +- + drivers/scsi/sr.c | 17 +- + drivers/scsi/st.c | 4 +- + drivers/scsi/ufs/ufshpb.c | 4 +- + drivers/scsi/virtio_scsi.c | 2 +- + drivers/target/target_core_pscsi.c | 2 +- + drivers/usb/storage/transport.c | 2 +- + fs/io_uring.c | 308 +++---- + fs/iomap/direct-io.c | 1 + + include/linux/blk-mq.h | 45 +- + include/linux/blkdev.h | 16 +- + include/linux/fs.h | 2 - + include/linux/genhd.h | 85 +- + include/linux/iocontext.h | 40 +- + include/linux/pagemap.h | 29 + + include/scsi/scsi_cmnd.h | 2 +- + include/scsi/scsi_device.h | 4 +- + include/scsi/scsi_ioctl.h | 4 +- + include/trace/events/block.h | 8 +- + include/uapi/linux/io_uring.h | 4 + + kernel/fork.c | 26 - + kernel/trace/blktrace.c | 2 +- + mm/filemap.c | 32 +- + 103 files changed, 1642 insertions(+), 1698 deletions(-) + delete mode 100644 block/blk-exec.c +Merging device-mapper/for-next (1b8d2789dad0 dm btree remove: fix use after free in rebalance_children()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/persistent-data/dm-btree-remove.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging libata/for-next (815b6cb37e8e ata: ahci_ceva: Fix id array access in ceva_ahci_read_id()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'recursive' strategy. + Makefile | 2 +- + drivers/ata/ahci_ceva.c | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (f9962ac595d2 mmc: sdhci-esdhc-imx: Add sdhc support for i.MXRT series) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging drivers/mmc/core/block.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 5 ++ + drivers/mmc/core/block.c | 4 +- + drivers/mmc/core/card.h | 36 +++++++++ + drivers/mmc/core/mmc.c | 2 +- + drivers/mmc/core/mmc_ops.c | 89 ++++++++++++++-------- + drivers/mmc/core/mmc_ops.h | 2 +- + drivers/mmc/core/quirks.h | 64 +++++++++++----- + drivers/mmc/core/sd.c | 2 +- + drivers/mmc/core/sdio.c | 5 +- + drivers/mmc/host/dw_mmc-exynos.c | 9 ++- + drivers/mmc/host/dw_mmc-hi3798cv200.c | 9 +-- + drivers/mmc/host/dw_mmc-rockchip.c | 11 +-- + drivers/mmc/host/dw_mmc.c | 35 ++++++++- + drivers/mmc/host/dw_mmc.h | 3 + + drivers/mmc/host/omap_hsmmc.c | 36 --------- + drivers/mmc/host/sdhci-esdhc-imx.c | 4 + + drivers/mmc/host/sdhci-pci-core.c | 1 + + drivers/mmc/host/sdhci-pci.h | 1 + + drivers/mmc/host/tmio_mmc_core.c | 15 +--- + 19 files changed, 206 insertions(+), 127 deletions(-) +Merging mfd/for-mfd-next (54d4c88b3759 mfd: Kconfig: Change INTEL_SOC_PMIC_CHTDC_TI to bool) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Removing include/linux/mfd/rohm-bd70528.h +Removing drivers/mfd/rohm-bd70528.c +Removing drivers/gpio/gpio-bd70528.c +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/regulator/rohm,bd70528-regulator.txt +Removing Documentation/devicetree/bindings/regulator/max77686.txt +Removing Documentation/devicetree/bindings/mfd/rohm,bd70528-pmic.txt +Removing Documentation/devicetree/bindings/mfd/max77686.txt +Removing Documentation/devicetree/bindings/mfd/bd9571mwv.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/bd9571mwv.txt | 69 ---- + Documentation/devicetree/bindings/mfd/max77686.txt | 26 -- + .../devicetree/bindings/mfd/maxim,max77686.yaml | 132 +++++++ + .../devicetree/bindings/mfd/rohm,bd70528-pmic.txt | 102 ------ + .../devicetree/bindings/mfd/rohm,bd9571mwv.yaml | 127 +++++++ + Documentation/devicetree/bindings/mfd/syscon.yaml | 1 + + .../devicetree/bindings/regulator/max77686.txt | 71 ---- + .../bindings/regulator/maxim,max77686.yaml | 83 +++++ + .../bindings/regulator/rohm,bd70528-regulator.txt | 68 ---- + MAINTAINERS | 10 +- + drivers/gpio/Kconfig | 11 - + drivers/gpio/Makefile | 1 - + drivers/gpio/gpio-bd70528.c | 230 ------------ + drivers/mfd/Kconfig | 23 +- + drivers/mfd/Makefile | 1 - + drivers/mfd/atmel-flexcom.c | 11 +- + drivers/mfd/da9062-core.c | 12 + + drivers/mfd/intel-lpss-acpi.c | 7 +- + drivers/mfd/intel-lpss-pci.c | 9 +- + drivers/mfd/rohm-bd70528.c | 314 ----------------- + drivers/mfd/stmpe.c | 2 +- + include/linux/mfd/rohm-bd70528.h | 389 --------------------- + include/linux/mfd/rohm-generic.h | 1 - + include/linux/mfd/ti_am335x_tscadc.h | 1 - + 24 files changed, 381 insertions(+), 1320 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mfd/bd9571mwv.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/max77686.txt + create mode 100644 Documentation/devicetree/bindings/mfd/maxim,max77686.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd70528-pmic.txt + create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd9571mwv.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/max77686.txt + create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max77686.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd70528-regulator.txt + delete mode 100644 drivers/gpio/gpio-bd70528.c + delete mode 100644 drivers/mfd/rohm-bd70528.c + delete mode 100644 include/linux/mfd/rohm-bd70528.h +Merging backlight/for-backlight-next (3976e974df1f video: backlight: ili9320: Make ili9320_remove() return void) +$ 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 (9652c02428f3 power: bq25890: add POWER_SUPPLY_PROP_TEMP) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-power | 2 +- + .../bindings/power/reset/gpio-poweroff.txt | 41 -- + .../bindings/power/reset/gpio-poweroff.yaml | 59 +++ + .../bindings/power/supply/maxim,max77976.yaml | 44 ++ + .../bindings/power/supply/qcom,pm8941-charger.yaml | 4 +- + MAINTAINERS | 6 + + drivers/power/supply/Kconfig | 12 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/ab8500-bm.h | 123 +---- + drivers/power/supply/ab8500-chargalg.h | 8 +- + drivers/power/supply/ab8500_bmdata.c | 572 +++++---------------- + drivers/power/supply/ab8500_btemp.c | 61 +-- + drivers/power/supply/ab8500_chargalg.c | 315 ++++++------ + drivers/power/supply/ab8500_charger.c | 536 ++++++++++--------- + drivers/power/supply/ab8500_fg.c | 371 ++++++------- + drivers/power/supply/bq25890_charger.c | 37 +- + drivers/power/supply/max77976_charger.c | 509 ++++++++++++++++++ + drivers/power/supply/power_supply_core.c | 61 +-- + drivers/power/supply/power_supply_sysfs.c | 1 + + drivers/power/supply/qcom_smbb.c | 5 +- + include/linux/power_supply.h | 216 +++++++- + 21 files changed, 1703 insertions(+), 1281 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/gpio-poweroff.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max77976.yaml + create mode 100644 drivers/power/supply/max77976_charger.c +Merging regulator/for-next (d69e19723f88 regulator: qcom-rpmh: Add support for PM8450 regulators) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging include/linux/regulator/driver.h +Auto-merging include/linux/mfd/rohm-generic.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/dlg,da9121.yaml | 76 +++++++------ + .../bindings/regulator/qcom,rpmh-regulator.yaml | 3 + + .../bindings/regulator/qcom,spmi-regulator.txt | 1 + + drivers/regulator/bd718x7-regulator.c | 29 +---- + drivers/regulator/da9121-regulator.c | 117 ++++++++++++++++++++- + drivers/regulator/da9121-regulator.h | 21 +++- + drivers/regulator/irq_helpers.c | 41 +++++++- + drivers/regulator/qcom-rpmh-regulator.c | 27 +++++ + drivers/regulator/qcom_spmi-regulator.c | 39 +++++++ + drivers/regulator/rohm-regulator.c | 16 +++ + include/linux/mfd/rohm-generic.h | 10 +- + include/linux/regulator/driver.h | 45 +++++++- + 12 files changed, 348 insertions(+), 77 deletions(-) +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Already up to date. +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (32ba540f3c2a evm: mark evm_fixmode as __ro_after_init) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Auto-merging scripts/Makefile +Auto-merging include/keys/system_keyring.h +Auto-merging certs/system_keyring.c +CONFLICT (content): Merge conflict in certs/system_keyring.c +Auto-merging certs/Makefile +Auto-merging certs/Kconfig +Resolved 'certs/system_keyring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c1e250dba18e] Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git +$ git diff -M --stat --summary HEAD^.. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (6326948f940d lsm: security_task_getsecid_subj() -> security_current_getsecid_subj()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'recursive' strategy. + include/linux/lsm_hook_defs.h | 3 +-- + include/linux/lsm_hooks.h | 8 +++----- + include/linux/security.h | 4 ++-- + kernel/audit.c | 4 ++-- + kernel/auditfilter.c | 3 +-- + kernel/auditsc.c | 11 ++++++++++- + net/netlabel/netlabel_unlabeled.c | 2 +- + net/netlabel/netlabel_user.h | 2 +- + security/apparmor/lsm.c | 13 ++++++++++--- + security/integrity/ima/ima_appraise.c | 2 +- + security/integrity/ima/ima_main.c | 14 +++++++------- + security/security.c | 6 +++--- + security/selinux/hooks.c | 19 +++---------------- + security/smack/smack.h | 16 ---------------- + security/smack/smack_lsm.c | 9 ++++----- + 15 files changed, 49 insertions(+), 67 deletions(-) +Merging smack/next (0934ad42bb2c smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (5d9f4cf36721 Merge tag 'selinux-pr-20211123' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux) +$ 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 (7eba41fe8c7b tpm_tis_spi: Add missing SPI ID) +$ 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 (0fcfb00b28c0 Linux 5.16-rc4) +$ 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 (86dc40c7ea9c iommu/vt-d: Fix unmap_pages support) +$ 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 (fa55b7dcdc43 Linux 5.16-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 (4e5b6de1f46d dt-bindings: net: cdns,macb: Convert to json-schema) +$ 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/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/net/macb.txt +Removing Documentation/devicetree/bindings/leds/leds-bcm6328.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + + .../bindings/display/simple-framebuffer.yaml | 12 + + .../bindings/dma/sifive,fu540-c000-pdma.yaml | 2 +- + .../devicetree/bindings/leds/leds-bcm6328.txt | 319 ---------------- + .../devicetree/bindings/leds/leds-bcm6328.yaml | 404 +++++++++++++++++++++ + .../devicetree/bindings/net/cdns,macb.yaml | 159 ++++++++ + .../bindings/net/ethernet-controller.yaml | 4 +- + Documentation/devicetree/bindings/net/macb.txt | 60 --- + .../devicetree/bindings/serial/pl011.yaml | 3 + + .../devicetree/bindings/thermal/thermal-zones.yaml | 9 +- + .../devicetree/bindings/trivial-devices.yaml | 9 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + drivers/of/base.c | 27 ++ + drivers/of/property.c | 17 +- + 14 files changed, 639 insertions(+), 389 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/leds/leds-bcm6328.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm6328.yaml + create mode 100644 Documentation/devicetree/bindings/net/cdns,macb.yaml + delete mode 100644 Documentation/devicetree/bindings/net/macb.txt +Merging mailbox/mailbox-for-next (97961f78e8bc mailbox: imx: support i.MX8ULP S4 MU) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (e9d7c323cfbb dt-bindings: mtd: spi-nor: Add a reference to spi-peripheral-props.yaml) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Removing include/linux/platform_data/spi-clps711x.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 3 +- + .../spi/cdns,qspi-nor-peripheral-props.yaml | 42 +++++ + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 33 ---- + .../devicetree/bindings/spi/renesas,rspi.yaml | 4 +- + .../devicetree/bindings/spi/spi-controller.yaml | 69 +------- + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 11 +- + .../bindings/spi/spi-peripheral-props.yaml | 89 ++++++++++ + .../devicetree/bindings/spi/spi-pl022.yaml | 3 + + Documentation/spi/pxa2xx.rst | 35 +--- + Documentation/spi/spidev.rst | 58 +++++-- + arch/arm/mach-pxa/lubbock.c | 15 +- + arch/arm/mach-pxa/stargate2.c | 2 +- + drivers/spi/Kconfig | 11 +- + drivers/spi/spi-atmel.c | 36 ++-- + drivers/spi/spi-bcm-qspi.c | 44 ++++- + drivers/spi/spi-dw-bt1.c | 9 +- + drivers/spi/spi-dw-core.c | 175 +++++++++++--------- + drivers/spi/spi-dw-dma.c | 55 ++++--- + drivers/spi/spi-dw-mmio.c | 22 +-- + drivers/spi/spi-dw-pci.c | 60 +++---- + drivers/spi/spi-dw.h | 182 +++++++++++---------- + drivers/spi/spi-fsl-lpspi.c | 6 +- + drivers/spi/spi-geni-qcom.c | 4 - + drivers/spi/spi-hisi-kunpeng.c | 15 +- + drivers/spi/spi-pxa2xx.c | 58 +------ + drivers/spi/spi-pxa2xx.h | 7 - + drivers/spi/spi-rspi.c | 27 ++- + drivers/spi/spi-tegra210-quad.c | 11 +- + drivers/spi/spi-xlp.c | 8 - + drivers/spi/spi.c | 180 ++++++++++---------- + drivers/spi/spidev.c | 9 +- + include/linux/platform_data/spi-clps711x.h | 17 -- + include/linux/spi/pxa2xx_spi.h | 5 - + 33 files changed, 682 insertions(+), 623 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/cdns,qspi-nor-peripheral-props.yaml + create mode 100644 Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml + delete mode 100644 include/linux/platform_data/spi-clps711x.h +Merging tip/auto-latest (9d8c5461d363 Merge x86/urgent into tip/master) +$ git merge -m Merge branch 'auto-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/auto-latest +Auto-merging kernel/sched/core.c +Auto-merging init/Kconfig +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kernel/amd_nb.c +Auto-merging arch/x86/include/asm/sev-common.h +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/microblaze/kernel/signal.c +Auto-merging arch/m68k/Kconfig +Removing arch/arm64/kvm/perf.c +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + Documentation/firmware-guide/acpi/apei/einj.rst | 19 ++ + Documentation/x86/sgx.rst | 14 +- + arch/alpha/kernel/signal.c | 2 +- + arch/arc/Kconfig | 1 - + arch/arm/Kconfig | 1 - + arch/arm/kernel/perf_callchain.c | 28 +- + arch/arm/kernel/signal.c | 2 +- + arch/arm/mm/alignment.c | 2 +- + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/kvm_host.h | 11 +- + arch/arm64/kernel/entry-common.c | 2 +- + arch/arm64/kernel/image-vars.h | 2 + + arch/arm64/kernel/perf_callchain.c | 13 +- + arch/arm64/kernel/ptrace.c | 4 +- + arch/arm64/kernel/signal.c | 2 +- + arch/arm64/kernel/syscall.c | 4 +- + arch/arm64/kvm/Kconfig | 1 + + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/arm.c | 10 +- + arch/arm64/kvm/perf.c | 59 ---- + arch/arm64/kvm/pmu-emul.c | 2 + + arch/csky/Kconfig | 1 - + arch/csky/kernel/perf_callchain.c | 10 - + arch/m68k/Kconfig | 1 - + arch/microblaze/kernel/signal.c | 2 +- + arch/mips/include/asm/futex.h | 29 +- + arch/nds32/kernel/perf_event_cpu.c | 29 +- + arch/openrisc/kernel/signal.c | 2 +- + arch/powerpc/kernel/interrupt.c | 15 +- + arch/powerpc/kernel/ptrace/ptrace.c | 3 +- + arch/riscv/Kconfig | 1 - + arch/riscv/kernel/perf_callchain.c | 10 - + arch/s390/Kconfig | 1 - + arch/sh/Kconfig | 1 - + arch/um/Kconfig | 1 - + arch/um/kernel/skas/uaccess.c | 1 - + arch/x86/Kconfig | 1 + + arch/x86/boot/compressed/sev.c | 6 +- + arch/x86/events/core.c | 13 +- + arch/x86/events/intel/core.c | 5 +- + arch/x86/include/asm/amd_nb.h | 1 - + arch/x86/include/asm/insn-eval.h | 13 + + arch/x86/include/asm/irqflags.h | 7 +- + arch/x86/include/asm/kvm_host.h | 7 +- + arch/x86/include/asm/mce.h | 3 - + arch/x86/include/asm/page_64.h | 1 + + arch/x86/include/asm/paravirt.h | 5 - + arch/x86/include/asm/processor.h | 8 + + arch/x86/include/asm/set_memory.h | 4 + + arch/x86/include/asm/sev-common.h | 55 ++-- + arch/x86/kernel/amd_nb.c | 49 +-- + arch/x86/kernel/cpu/common.c | 15 +- + arch/x86/kernel/cpu/mce/amd.c | 200 ------------ + arch/x86/kernel/cpu/mce/core.c | 5 - + arch/x86/kernel/cpu/sgx/main.c | 113 ++++++- + arch/x86/kernel/cpu/sgx/sgx.h | 7 +- + arch/x86/kernel/fpu/core.c | 21 +- + arch/x86/kernel/head64.c | 60 ++-- + arch/x86/kernel/process.c | 8 +- + arch/x86/kernel/process.h | 4 +- + arch/x86/kernel/sev-shared.c | 2 +- + arch/x86/kernel/sev.c | 183 +++-------- + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/pmu.c | 2 +- + arch/x86/kvm/svm/svm.c | 2 +- + arch/x86/kvm/vmx/vmx.c | 25 +- + arch/x86/kvm/x86.c | 58 +--- + arch/x86/kvm/x86.h | 17 +- + arch/x86/lib/csum-partial_64.c | 181 ++++++----- + arch/x86/lib/insn-eval.c | 109 ++++++- + arch/x86/mm/tlb.c | 2 +- + arch/x86/platform/ce4100/falconfalls.dts | 4 +- + arch/x86/xen/Kconfig | 1 + + arch/x86/xen/pmu.c | 32 +- + arch/xtensa/Kconfig | 1 - + arch/xtensa/include/asm/futex.h | 8 +- + drivers/acpi/apei/einj.c | 3 +- + drivers/acpi/apei/ghes.c | 2 +- + drivers/edac/amd64_edac.c | 275 +++++++++++++++++ + include/asm-generic/futex.h | 31 +- + include/kvm/arm_pmu.h | 19 +- + include/linux/entry-kvm.h | 2 +- + include/linux/irqdomain.h | 2 +- + include/linux/kvm_host.h | 10 + + include/linux/mm.h | 13 + + include/linux/perf_event.h | 44 ++- + include/linux/psi.h | 1 + + include/linux/psi_types.h | 14 +- + include/linux/sched.h | 4 + + include/linux/thread_info.h | 14 + + init/Kconfig | 13 +- + kernel/entry/common.c | 4 +- + kernel/entry/kvm.c | 4 +- + kernel/events/core.c | 41 ++- + kernel/futex/core.c | 35 --- + kernel/futex/futex.h | 6 - + kernel/futex/syscalls.c | 22 -- + kernel/irq/generic-chip.c | 2 +- + kernel/locking/ww_rt_mutex.c | 2 +- + kernel/sched/core.c | 84 +++-- + kernel/sched/core_sched.c | 66 +++- + kernel/sched/cpuacct.c | 107 +++---- + kernel/sched/cputime.c | 4 +- + kernel/sched/debug.c | 4 + + kernel/sched/fair.c | 2 +- + kernel/sched/psi.c | 47 +-- + kernel/sched/sched.h | 32 +- + kernel/sched/stats.h | 5 +- + mm/memory-failure.c | 19 +- + tools/testing/selftests/sgx/Makefile | 2 +- + tools/testing/selftests/sgx/defines.h | 33 +- + tools/testing/selftests/sgx/load.c | 40 ++- + tools/testing/selftests/sgx/main.c | 357 +++++++++++++++++++--- + tools/testing/selftests/sgx/main.h | 6 +- + tools/testing/selftests/sgx/sigstruct.c | 12 +- + tools/testing/selftests/sgx/test_encl.c | 60 +++- + tools/testing/selftests/sgx/test_encl_bootstrap.S | 21 +- + virt/kvm/kvm_main.c | 44 +++ + 118 files changed, 1856 insertions(+), 1180 deletions(-) + delete mode 100644 arch/arm64/kvm/perf.c +Merging clockevents/timers/drivers/next (453e2cadc97c dt-bindings: timer: tpm-timer: Add imx8ulp compatible string) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/timer/cdns,ttc.yaml | 3 ++ + .../devicetree/bindings/timer/nxp,tpm-timer.yaml | 6 ++- + .../bindings/timer/rockchip,rk-timer.yaml | 1 - + drivers/clocksource/exynos_mct.c | 50 +++++++++++++--------- + 4 files changed, 38 insertions(+), 22 deletions(-) +Merging edac/edac-for-next (0cfbfbdc97d6 Merge branch 'edac-misc' 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 'recursive' strategy. + .../memory-controllers/synopsys,ddrc-ecc.yaml | 1 + + drivers/edac/Kconfig | 2 +- + drivers/edac/sifive_edac.c | 2 +- + drivers/edac/synopsys_edac.c | 52 ++++++++++++++++++---- + 4 files changed, 46 insertions(+), 11 deletions(-) +Merging irqchip/irq/irqchip-next (11e45471abea Merge branch irq/misc-5.16 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 +Already up to date. +Merging ftrace/for-next (a55f224ff5f2 tracing: Fix pid filtering when triggers are attached) +$ 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 (cd21e779ff21 kcsan: Turn barrier instrumentation into macros) +$ 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 include/linux/sched.h +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../RCU/Design/Expedited-Grace-Periods/Funnel0.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel1.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel2.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel3.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel4.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel5.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel6.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel7.svg | 4 +- + .../RCU/Design/Expedited-Grace-Periods/Funnel8.svg | 4 +- + .../Design/Requirements/GPpartitionReaders1.svg | 36 +- + .../Design/Requirements/ReadersPartitionGP1.svg | 62 +-- + Documentation/RCU/stallwarn.rst | 11 - + Documentation/RCU/whatisRCU.rst | 90 +++- + Documentation/admin-guide/kernel-parameters.txt | 74 +++- + .../admin-guide/kernel-per-CPU-kthreads.rst | 2 +- + Documentation/dev-tools/kcsan.rst | 76 +++- + .../litmus-tests/locking/DCL-broken.litmus | 55 +++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 +++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + Documentation/timers/no_hz.rst | 10 +- + MAINTAINERS | 2 + + arch/x86/include/asm/barrier.h | 10 +- + arch/x86/include/asm/qspinlock.h | 1 + + include/asm-generic/barrier.h | 54 ++- + include/asm-generic/bitops/instrumented-atomic.h | 3 + + include/asm-generic/bitops/instrumented-lock.h | 3 + + include/linux/atomic/atomic-instrumented.h | 135 +++++- + include/linux/compiler_attributes.h | 18 + + include/linux/compiler_types.h | 13 +- + include/linux/kcsan-checks.h | 83 +++- + include/linux/kcsan.h | 11 +- + include/linux/rcu_segcblist.h | 51 ++- + include/linux/rcupdate.h | 52 ++- + include/linux/rcutiny.h | 2 +- + include/linux/sched.h | 3 + + include/linux/spinlock.h | 2 +- + include/linux/srcu.h | 3 +- + include/linux/torture.h | 9 +- + init/init_task.c | 5 - + kernel/kcsan/Makefile | 2 + + kernel/kcsan/core.c | 338 ++++++++++++--- + kernel/kcsan/kcsan_test.c | 424 ++++++++++++++++-- + kernel/kcsan/report.c | 51 ++- + kernel/kcsan/selftest.c | 141 ++++++ + kernel/locking/locktorture.c | 4 +- + kernel/rcu/Kconfig | 20 +- + kernel/rcu/rcu_segcblist.c | 10 +- + kernel/rcu/rcu_segcblist.h | 12 +- + kernel/rcu/rcuscale.c | 14 +- + kernel/rcu/rcutorture.c | 234 +++++++--- + kernel/rcu/refscale.c | 51 ++- + kernel/rcu/srcutiny.c | 2 +- + kernel/rcu/tasks.h | 473 +++++++++++++++++---- + kernel/rcu/tree.c | 131 ++++-- + kernel/rcu/tree.h | 31 +- + kernel/rcu/tree_exp.h | 14 +- + kernel/rcu/tree_nocb.h | 160 ++++--- + kernel/rcu/tree_plugin.h | 250 ++--------- + kernel/rcu/tree_stall.h | 27 +- + kernel/scftorture.c | 16 +- + kernel/sched/Makefile | 7 +- + kernel/time/clocksource.c | 52 ++- + kernel/torture.c | 4 +- + kernel/workqueue.c | 22 +- + lib/Kconfig.kcsan | 20 + + mm/Makefile | 2 + + scripts/Makefile.kcsan | 15 +- + scripts/Makefile.lib | 5 + + scripts/atomic/gen-atomic-instrumented.sh | 41 +- + tools/include/nolibc/nolibc.h | 86 ++-- + tools/memory-model/Documentation/explanation.txt | 44 +- + tools/memory-model/Documentation/locking.txt | 320 ++++++++++++++ + tools/memory-model/README | 12 + + tools/memory-model/linux-kernel.cat | 6 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + .../LB+unlocklockonceonce+poacquireonce.litmus | 35 ++ + .../MP+unlocklockonceonce+fencermbonceonce.litmus | 33 ++ + tools/memory-model/litmus-tests/README | 8 + + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 ++- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + tools/objtool/check.c | 41 +- + tools/objtool/include/objtool/elf.h | 2 +- + tools/testing/selftests/bpf/prog_tests/atomics.c | 4 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 4 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 23 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 11 +- + .../selftests/rcutorture/bin/parse-build.sh | 3 +- + .../selftests/rcutorture/configs/rcu/SRCU-T | 1 + + .../selftests/rcutorture/configs/rcu/SRCU-U | 1 + + .../selftests/rcutorture/configs/rcu/TASKS01.boot | 1 + + .../selftests/rcutorture/configs/rcu/TINY01 | 1 + + .../selftests/rcutorture/configs/rcu/TINY02 | 1 + + .../selftests/rcutorture/configs/rcu/TRACE01.boot | 1 + + .../selftests/rcutorture/configs/rcu/TRACE02.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE01 | 1 - + .../selftests/rcutorture/configs/rcu/TREE02 | 1 - + .../selftests/rcutorture/configs/rcu/TREE02.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE04 | 1 - + .../selftests/rcutorture/configs/rcu/TREE05 | 1 - + .../selftests/rcutorture/configs/rcu/TREE06 | 1 - + .../selftests/rcutorture/configs/rcu/TREE07 | 1 - + .../selftests/rcutorture/configs/rcu/TREE08 | 1 - + .../selftests/rcutorture/configs/rcu/TREE10 | 1 - + .../selftests/rcutorture/configs/rcu/TREE10.boot | 1 + + .../selftests/rcutorture/configs/rcuscale/TINY | 2 +- + .../selftests/rcutorture/configs/rcuscale/TRACE01 | 1 - + .../selftests/rcutorture/configs/rcuscale/TREE | 1 - + .../selftests/rcutorture/configs/rcuscale/TREE54 | 1 - + .../rcutorture/configs/refscale/NOPREEMPT | 1 - + .../selftests/rcutorture/configs/refscale/PREEMPT | 1 - + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 1 - + 126 files changed, 3681 insertions(+), 1091 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100644 tools/memory-model/litmus-tests/LB+unlocklockonceonce+poacquireonce.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+unlocklockonceonce+fencermbonceonce.litmus + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE02.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE10.boot +Merging kvm/next (da1bfd52b930 KVM: x86: Drop arbitrary KVM_SOFT_MAX_VCPUS) +$ 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 (3d9601d85d14 Merge branch kvm-arm64/misc-5.17 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging arch/arm64/kvm/pmu-emul.c +Auto-merging arch/arm64/kvm/hyp/vhe/switch.c +Auto-merging arch/arm64/kvm/hyp/nvhe/switch.c +Auto-merging arch/arm64/kvm/hyp/include/hyp/switch.h +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/include/asm/kvm_host.h +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/kvm_host.h | 41 ++++++++++------------- + arch/arm64/include/asm/kvm_hyp.h | 1 - + arch/arm64/include/asm/sysreg.h | 1 + + arch/arm64/kernel/fpsimd.c | 6 +++- + arch/arm64/kvm/arm.c | 58 +++++++++++++++++++-------------- + arch/arm64/kvm/fpsimd.c | 57 +++++++++----------------------- + arch/arm64/kvm/hyp/fpsimd.S | 6 ---- + arch/arm64/kvm/hyp/include/hyp/switch.h | 30 +++-------------- + arch/arm64/kvm/hyp/nvhe/switch.c | 1 - + arch/arm64/kvm/hyp/vhe/switch.c | 1 - + arch/arm64/kvm/pmu-emul.c | 1 + + arch/arm64/kvm/reset.c | 11 ++++++- + arch/arm64/kvm/vgic/vgic-init.c | 2 +- + 13 files changed, 88 insertions(+), 128 deletions(-) +Merging kvms390/next (3fd8417f2c72 KVM: s390: add debug statement for diag 318 CPNC data) +$ 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 (00db58cf2118 xen: make HYPERVISOR_set_debugreg() always_inline) +$ 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 (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (45c753f5f24d workqueue: Fix unbind_workers() VS wq_worker_sleeping() race) +$ 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 'recursive' strategy. +Merging drivers-x86/for-next (a602f5111fdd platform/x86: amd-pmc: Fix s2idle failures on certain AMD laptops) +$ 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 drivers/platform/x86/thinkpad_acpi.c +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-firmware-attributes | 32 + + drivers/platform/surface/aggregator/bus.c | 24 +- + drivers/platform/surface/aggregator/bus.h | 3 - + drivers/platform/surface/aggregator/core.c | 3 +- + .../platform/surface/surface_aggregator_registry.c | 32 +- + drivers/platform/x86/asus-wmi.c | 567 ++++++++++++++- + drivers/platform/x86/think-lmi.c | 327 +++++++-- + drivers/platform/x86/think-lmi.h | 28 +- + drivers/platform/x86/thinkpad_acpi.c | 809 +++++++++------------ + include/linux/platform_data/x86/asus-wmi.h | 2 + + include/linux/surface_aggregator/device.h | 9 + + 11 files changed, 1296 insertions(+), 540 deletions(-) +Merging chrome-platform/for-next (297d34e73d49 platform/chrome: cros_ec_proto: Use ec_command for check_features) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging hsi/for-next (a1ee1c08fcd5 HSI: core: Fix return freed object in hsi_new_client) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/hsi_core.c | 1 + + 1 file changed, 1 insertion(+) +Merging leds/for-next (66340b5a6f86 leds: leds-fsg: Drop FSG3 LED driver) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Removing drivers/leds/leds-fsg.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-mt6360.yaml | 159 ++++ + drivers/leds/Kconfig | 7 - + drivers/leds/Makefile | 1 - + drivers/leds/flash/Kconfig | 13 + + drivers/leds/flash/Makefile | 1 + + drivers/leds/flash/leds-mt6360.c | 910 +++++++++++++++++++++ + drivers/leds/led-class.c | 6 +- + drivers/leds/leds-fsg.c | 193 ----- + drivers/leds/leds-lp50xx.c | 1 - + drivers/leds/leds-tca6507.c | 4 +- + 10 files changed, 1086 insertions(+), 209 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-mt6360.yaml + create mode 100644 drivers/leds/flash/leds-mt6360.c + delete mode 100644 drivers/leds/leds-fsg.c +Merging ipmi/for-next (0d075db78c25 ipmi/watchdog: Constify ident) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/char/ipmi/ipmi_watchdog.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging driver-core/driver-core-next (c097af1d0a84 device property: Check fwnode->secondary when finding properties) +$ 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/property.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 15 ++ + Documentation/admin-guide/cputopology.rst | 33 ++- + Documentation/driver-api/auxiliary_bus.rst | 236 +++------------------ + drivers/base/auxiliary.c | 152 ++++++++++++- + drivers/base/platform.c | 5 +- + drivers/base/property.c | 13 +- + drivers/base/topology.c | 28 ++- + fs/kernfs/dir.c | 118 +++++++---- + fs/kernfs/file.c | 6 +- + fs/kernfs/inode.c | 22 +- + fs/kernfs/mount.c | 15 +- + fs/kernfs/symlink.c | 5 +- + include/linux/auxiliary_bus.h | 164 ++++++++++++++ + include/linux/kernfs.h | 2 + + include/linux/kobject.h | 2 +- + include/linux/topology.h | 25 +++ + 16 files changed, 535 insertions(+), 306 deletions(-) +Merging usb/usb-next (e1c72d907f4c usb: bdc: fix error handling code in bdc_resume) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/dwc2.yaml | 10 ++++ + .../devicetree/bindings/usb/qcom,dwc3.yaml | 2 + + .../driver-api/usb/writing_usb_driver.rst | 32 ++++++----- + drivers/usb/cdns3/cdnsp-gadget.c | 2 +- + drivers/usb/chipidea/otg.c | 5 +- + drivers/usb/dwc2/gadget.c | 4 +- + drivers/usb/dwc3/dwc3-meson-g12a.c | 17 ++++-- + drivers/usb/dwc3/gadget.c | 33 +++++++---- + drivers/usb/gadget/composite.c | 39 ++++++++----- + drivers/usb/gadget/configfs.c | 39 +++---------- + drivers/usb/gadget/function/f_fs.c | 4 +- + drivers/usb/gadget/function/f_midi.c | 48 +++++++++++++++- + drivers/usb/gadget/udc/at91_udc.c | 67 ++++++++-------------- + drivers/usb/gadget/udc/at91_udc.h | 8 +-- + drivers/usb/gadget/udc/bdc/bdc_core.c | 1 + + drivers/usb/gadget/udc/mv_udc_core.c | 4 +- + drivers/usb/gadget/udc/udc-xilinx.c | 56 ++++++++++++++++++ + drivers/usb/host/ehci-brcm.c | 6 +- + drivers/usb/host/u132-hcd.c | 1 - + drivers/usb/host/uhci-platform.c | 3 +- + drivers/usb/host/xhci-mtk.c | 16 +++--- + drivers/usb/phy/phy-mv-usb.c | 5 +- + drivers/usb/typec/ucsi/ucsi.c | 16 +++++- + drivers/usb/usbip/usbip_event.c | 1 - + 24 files changed, 266 insertions(+), 153 deletions(-) +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 (d58071a8a76d Linux 5.16-rc3) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) +$ git merge -m Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-next/for-usb-next +Merge made by the 'recursive' strategy. +Merging tty/tty-next (13a5fad39a7b tty: mips_ejtag_fdc: Make use of the helper function kthread_run_on_cpu()) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging include/linux/pci_ids.h +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging drivers/tty/serial/fsl_lpuart.c +Auto-merging drivers/tty/serial/amba-pl011.c +Auto-merging drivers/tty/serial/8250/8250_port.c +Auto-merging drivers/net/hamradio/mkiss.c +Removing Documentation/driver-api/serial/tty.rst +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/fsl-lpuart.yaml | 4 +- + .../devicetree/bindings/serial/renesas,sci.yaml | 46 +- + .../devicetree/bindings/serial/renesas,scif.yaml | 1 + + Documentation/driver-api/serial/index.rst | 1 - + Documentation/driver-api/serial/tty.rst | 328 -------- + Documentation/index.rst | 1 + + Documentation/tty/index.rst | 63 ++ + Documentation/tty/n_tty.rst | 22 + + Documentation/tty/tty_buffer.rst | 46 ++ + Documentation/tty/tty_driver.rst | 128 +++ + Documentation/tty/tty_internals.rst | 31 + + Documentation/tty/tty_ldisc.rst | 85 ++ + Documentation/tty/tty_port.rst | 70 ++ + Documentation/tty/tty_struct.rst | 81 ++ + arch/alpha/kernel/srmcons.c | 2 +- + arch/arm/include/debug/pl01x.S | 7 - + drivers/accessibility/speakup/spk_ttyio.c | 4 +- + drivers/bluetooth/hci_ldisc.c | 5 +- + drivers/input/serio/serport.c | 5 +- + drivers/net/can/slcan.c | 4 +- + drivers/net/hamradio/6pack.c | 4 +- + drivers/net/hamradio/mkiss.c | 4 +- + drivers/net/ppp/ppp_async.c | 3 +- + drivers/net/ppp/ppp_synctty.c | 3 +- + drivers/net/slip/slip.c | 4 +- + drivers/s390/char/keyboard.h | 4 +- + drivers/tty/goldfish.c | 2 +- + drivers/tty/mips_ejtag_fdc.c | 22 +- + drivers/tty/moxa.c | 4 +- + drivers/tty/mxser.c | 306 +++---- + drivers/tty/n_gsm.c | 11 +- + drivers/tty/n_hdlc.c | 5 +- + drivers/tty/n_tty.c | 692 ++++++++-------- + drivers/tty/serial/8250/8250_dw.c | 3 + + drivers/tty/serial/8250/8250_port.c | 2 +- + drivers/tty/serial/amba-pl011.c | 64 +- + drivers/tty/serial/atmel_serial.c | 14 + + drivers/tty/serial/fsl_lpuart.c | 4 +- + drivers/tty/serial/imx.c | 13 +- + drivers/tty/serial/lpc32xx_hs.c | 2 +- + drivers/tty/serial/serial_core.c | 12 +- + drivers/tty/serial/sh-sci.c | 39 +- + drivers/tty/serial/uartlite.c | 2 +- + drivers/tty/tty_buffer.c | 279 +++---- + drivers/tty/tty_io.c | 912 ++++++++++----------- + drivers/tty/tty_ldisc.c | 292 +++---- + drivers/tty/tty_port.c | 223 +++-- + drivers/tty/vt/keyboard.c | 6 +- + drivers/tty/vt/vt.c | 2 +- + include/linux/amba/bus.h | 6 - + include/linux/pci_ids.h | 18 - + include/linux/tty.h | 153 +++- + include/linux/tty_driver.h | 572 ++++++++----- + include/linux/tty_flip.h | 1 - + include/linux/tty_ldisc.h | 287 ++++--- + include/linux/tty_port.h | 131 ++- + net/nfc/nci/uart.c | 5 +- + 57 files changed, 2720 insertions(+), 2320 deletions(-) + delete mode 100644 Documentation/driver-api/serial/tty.rst + create mode 100644 Documentation/tty/index.rst + create mode 100644 Documentation/tty/n_tty.rst + create mode 100644 Documentation/tty/tty_buffer.rst + create mode 100644 Documentation/tty/tty_driver.rst + create mode 100644 Documentation/tty/tty_internals.rst + create mode 100644 Documentation/tty/tty_ldisc.rst + create mode 100644 Documentation/tty/tty_port.rst + create mode 100644 Documentation/tty/tty_struct.rst +Merging char-misc/char-misc-next (70602b37c4af driver: soc: xilinx: register for power events in zynqmp power driver) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging drivers/soc/xilinx/zynqmp_power.c +Auto-merging drivers/misc/eeprom/at25.c +CONFLICT (content): Merge conflict in drivers/misc/eeprom/at25.c +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging MAINTAINERS +Recorded preimage for 'drivers/misc/eeprom/at25.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/misc/eeprom/at25.c'. +[master 129985867961] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 8 + + drivers/accessibility/speakup/speakup_acntpc.c | 2 +- + drivers/accessibility/speakup/speakup_dtlk.c | 2 +- + drivers/accessibility/speakup/speakup_keypc.c | 2 +- + drivers/android/binder.c | 434 +++++++++++++-- + drivers/char/mwave/3780i.h | 2 +- + drivers/comedi/comedi_buf.c | 3 +- + drivers/comedi/comedi_fops.c | 2 +- + drivers/comedi/comedi_pci.c | 3 +- + drivers/comedi/comedi_pcmcia.c | 3 +- + drivers/comedi/comedi_usb.c | 3 +- + drivers/comedi/drivers.c | 3 +- + drivers/comedi/drivers/8255.c | 5 +- + drivers/comedi/drivers/8255_pci.c | 6 +- + drivers/comedi/drivers/addi_apci_1032.c | 2 +- + drivers/comedi/drivers/addi_apci_1500.c | 2 +- + drivers/comedi/drivers/addi_apci_1516.c | 2 +- + drivers/comedi/drivers/addi_apci_1564.c | 2 +- + drivers/comedi/drivers/addi_apci_16xx.c | 3 +- + drivers/comedi/drivers/addi_apci_2032.c | 2 +- + drivers/comedi/drivers/addi_apci_2200.c | 2 +- + drivers/comedi/drivers/addi_apci_3120.c | 2 +- + drivers/comedi/drivers/addi_apci_3501.c | 2 +- + drivers/comedi/drivers/addi_apci_3xxx.c | 3 +- + drivers/comedi/drivers/addi_watchdog.c | 2 +- + drivers/comedi/drivers/adl_pci6208.c | 3 +- + drivers/comedi/drivers/adl_pci7x3x.c | 3 +- + drivers/comedi/drivers/adl_pci8164.c | 3 +- + drivers/comedi/drivers/adl_pci9111.c | 5 +- + drivers/comedi/drivers/adl_pci9118.c | 5 +- + drivers/comedi/drivers/adq12b.c | 3 +- + drivers/comedi/drivers/adv_pci1710.c | 5 +- + drivers/comedi/drivers/adv_pci1720.c | 3 +- + drivers/comedi/drivers/adv_pci1723.c | 3 +- + drivers/comedi/drivers/adv_pci1724.c | 3 +- + drivers/comedi/drivers/adv_pci1760.c | 3 +- + drivers/comedi/drivers/adv_pci_dio.c | 8 +- + drivers/comedi/drivers/aio_aio12_8.c | 7 +- + drivers/comedi/drivers/aio_iiro_16.c | 3 +- + drivers/comedi/drivers/amplc_dio200.c | 2 +- + drivers/comedi/drivers/amplc_dio200_common.c | 7 +- + drivers/comedi/drivers/amplc_dio200_pci.c | 3 +- + drivers/comedi/drivers/amplc_pc236.c | 3 +- + drivers/comedi/drivers/amplc_pc236_common.c | 5 +- + drivers/comedi/drivers/amplc_pc263.c | 2 +- + drivers/comedi/drivers/amplc_pci224.c | 6 +- + drivers/comedi/drivers/amplc_pci230.c | 8 +- + drivers/comedi/drivers/amplc_pci236.c | 3 +- + drivers/comedi/drivers/amplc_pci263.c | 3 +- + drivers/comedi/drivers/c6xdigio.c | 3 +- + drivers/comedi/drivers/cb_das16_cs.c | 6 +- + drivers/comedi/drivers/cb_pcidas.c | 7 +- + drivers/comedi/drivers/cb_pcidas64.c | 5 +- + drivers/comedi/drivers/cb_pcidda.c | 6 +- + drivers/comedi/drivers/cb_pcimdas.c | 7 +- + drivers/comedi/drivers/cb_pcimdda.c | 6 +- + drivers/comedi/drivers/comedi_8254.c | 6 +- + drivers/comedi/drivers/comedi_8255.c | 5 +- + drivers/comedi/drivers/comedi_bond.c | 6 +- + drivers/comedi/drivers/comedi_isadma.c | 6 +- + drivers/comedi/drivers/comedi_parport.c | 3 +- + drivers/comedi/drivers/comedi_test.c | 4 +- + drivers/comedi/drivers/contec_pci_dio.c | 3 +- + drivers/comedi/drivers/dac02.c | 3 +- + drivers/comedi/drivers/daqboard2000.c | 5 +- + drivers/comedi/drivers/das08.c | 7 +- + drivers/comedi/drivers/das08_cs.c | 3 +- + drivers/comedi/drivers/das08_isa.c | 2 +- + drivers/comedi/drivers/das08_pci.c | 3 +- + drivers/comedi/drivers/das16.c | 10 +- + drivers/comedi/drivers/das16m1.c | 7 +- + drivers/comedi/drivers/das1800.c | 8 +- + drivers/comedi/drivers/das6402.c | 6 +- + drivers/comedi/drivers/das800.c | 6 +- + drivers/comedi/drivers/dmm32at.c | 5 +- + drivers/comedi/drivers/dt2801.c | 2 +- + drivers/comedi/drivers/dt2811.c | 3 +- + drivers/comedi/drivers/dt2814.c | 3 +- + drivers/comedi/drivers/dt2815.c | 3 +- + drivers/comedi/drivers/dt2817.c | 2 +- + drivers/comedi/drivers/dt282x.c | 6 +- + drivers/comedi/drivers/dt3000.c | 3 +- + drivers/comedi/drivers/dt9812.c | 3 +- + drivers/comedi/drivers/dyna_pci10xx.c | 3 +- + drivers/comedi/drivers/fl512.c | 3 +- + drivers/comedi/drivers/gsc_hpdi.c | 3 +- + drivers/comedi/drivers/icp_multi.c | 3 +- + drivers/comedi/drivers/ii_pci20kc.c | 2 +- + drivers/comedi/drivers/jr3_pci.c | 3 +- + drivers/comedi/drivers/ke_counter.c | 3 +- + drivers/comedi/drivers/me4000.c | 5 +- + drivers/comedi/drivers/me_daq.c | 3 +- + drivers/comedi/drivers/mf6x4.c | 3 +- + drivers/comedi/drivers/mite.c | 3 +- + drivers/comedi/drivers/mpc624.c | 3 +- + drivers/comedi/drivers/multiq3.c | 3 +- + drivers/comedi/drivers/ni_6527.c | 3 +- + drivers/comedi/drivers/ni_65xx.c | 3 +- + drivers/comedi/drivers/ni_660x.c | 3 +- + drivers/comedi/drivers/ni_670x.c | 3 +- + drivers/comedi/drivers/ni_at_a2150.c | 8 +- + drivers/comedi/drivers/ni_at_ao.c | 6 +- + drivers/comedi/drivers/ni_atmio.c | 5 +- + drivers/comedi/drivers/ni_atmio16d.c | 5 +- + drivers/comedi/drivers/ni_daq_700.c | 3 +- + drivers/comedi/drivers/ni_daq_dio24.c | 5 +- + drivers/comedi/drivers/ni_labpc.c | 3 +- + drivers/comedi/drivers/ni_labpc_common.c | 7 +- + drivers/comedi/drivers/ni_labpc_cs.c | 3 +- + drivers/comedi/drivers/ni_labpc_isadma.c | 5 +- + drivers/comedi/drivers/ni_labpc_pci.c | 3 +- + drivers/comedi/drivers/ni_mio_common.c | 2 +- + drivers/comedi/drivers/ni_mio_cs.c | 4 +- + drivers/comedi/drivers/ni_pcidio.c | 3 +- + drivers/comedi/drivers/ni_pcimio.c | 4 +- + drivers/comedi/drivers/ni_routes.c | 3 +- + drivers/comedi/drivers/ni_routes.h | 2 +- + .../comedi/drivers/ni_routing/ni_route_values.h | 2 +- + drivers/comedi/drivers/ni_routing/tools/.gitignore | 1 + + drivers/comedi/drivers/ni_routing/tools/Makefile | 29 +- + drivers/comedi/drivers/ni_tio.h | 2 +- + drivers/comedi/drivers/ni_usb6501.c | 3 +- + drivers/comedi/drivers/pcl711.c | 6 +- + drivers/comedi/drivers/pcl724.c | 5 +- + drivers/comedi/drivers/pcl726.c | 3 +- + drivers/comedi/drivers/pcl730.c | 2 +- + drivers/comedi/drivers/pcl812.c | 8 +- + drivers/comedi/drivers/pcl816.c | 8 +- + drivers/comedi/drivers/pcl818.c | 8 +- + drivers/comedi/drivers/pcm3724.c | 5 +- + drivers/comedi/drivers/pcmad.c | 2 +- + drivers/comedi/drivers/pcmda12.c | 2 +- + drivers/comedi/drivers/pcmmio.c | 3 +- + drivers/comedi/drivers/pcmuio.c | 3 +- + drivers/comedi/drivers/quatech_daqp_cs.c | 3 +- + drivers/comedi/drivers/rtd520.c | 5 +- + drivers/comedi/drivers/rti800.c | 2 +- + drivers/comedi/drivers/rti802.c | 2 +- + drivers/comedi/drivers/s526.c | 2 +- + drivers/comedi/drivers/s626.c | 3 +- + drivers/comedi/drivers/ssv_dnp.c | 2 +- + drivers/comedi/drivers/usbdux.c | 3 +- + drivers/comedi/drivers/usbduxfast.c | 2 +- + drivers/comedi/drivers/usbduxsigma.c | 3 +- + drivers/comedi/drivers/vmk80xx.c | 3 +- + drivers/comedi/kcomedilib/kcomedilib_main.c | 6 +- + drivers/comedi/proc.c | 2 +- + drivers/comedi/range.c | 2 +- + drivers/firmware/xilinx/zynqmp.c | 40 +- + drivers/misc/eeprom/at25.c | 220 ++++---- + drivers/misc/mei/hw-txe.c | 6 +- + drivers/most/most_usb.c | 4 +- + drivers/nvmem/core.c | 2 + + drivers/soc/xilinx/Kconfig | 10 + + drivers/soc/xilinx/Makefile | 1 + + drivers/soc/xilinx/xlnx_event_manager.c | 600 +++++++++++++++++++++ + drivers/soc/xilinx/zynqmp_power.c | 54 +- + drivers/virt/nitro_enclaves/Kconfig | 9 + + drivers/virt/nitro_enclaves/ne_misc_dev.c | 174 ++++-- + drivers/virt/nitro_enclaves/ne_misc_dev_test.c | 157 ++++++ + drivers/virt/nitro_enclaves/ne_pci_dev.c | 1 - + drivers/w1/slaves/w1_ds28e04.c | 26 +- + include/linux/byteorder/generic.h | 4 +- + .../drivers => include/linux/comedi}/comedi_8254.h | 0 + .../8255.h => include/linux/comedi/comedi_8255.h | 8 +- + .../linux/comedi}/comedi_isadma.h | 0 + {drivers => include/linux}/comedi/comedi_pci.h | 3 +- + {drivers => include/linux}/comedi/comedi_pcmcia.h | 3 +- + {drivers => include/linux}/comedi/comedi_usb.h | 3 +- + {drivers => include/linux}/comedi/comedidev.h | 3 +- + {drivers => include/linux}/comedi/comedilib.h | 0 + include/linux/firmware/xlnx-event-manager.h | 36 ++ + include/linux/firmware/xlnx-zynqmp.h | 33 +- + {drivers/comedi => include/uapi/linux}/comedi.h | 2 +- + scripts/tags.sh | 126 ++--- + 175 files changed, 1876 insertions(+), 668 deletions(-) + create mode 100644 drivers/soc/xilinx/xlnx_event_manager.c + create mode 100644 drivers/virt/nitro_enclaves/ne_misc_dev_test.c + rename {drivers/comedi/drivers => include/linux/comedi}/comedi_8254.h (100%) + rename drivers/comedi/drivers/8255.h => include/linux/comedi/comedi_8255.h (90%) + rename {drivers/comedi/drivers => include/linux/comedi}/comedi_isadma.h (100%) + rename {drivers => include/linux}/comedi/comedi_pci.h (98%) + rename {drivers => include/linux}/comedi/comedi_pcmcia.h (97%) + rename {drivers => include/linux}/comedi/comedi_usb.h (97%) + rename {drivers => include/linux}/comedi/comedidev.h (99%) + rename {drivers => include/linux}/comedi/comedilib.h (100%) + create mode 100644 include/linux/firmware/xlnx-event-manager.h + rename {drivers/comedi => include/uapi/linux}/comedi.h (99%) +Merging extcon/extcon-next (9e6ef3a25e5e dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging phy-next/next (17dcc120fb8d phy: lan966x: Extend lan966x to support multiple phy interfaces.) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging drivers/phy/st/phy-stm32-usbphyc.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/phy/phy-tegra194-p2u.txt +Merge made by the 'recursive' strategy. + .../bindings/phy/amlogic,meson8-hdmi-tx-phy.yaml | 65 ++ + .../bindings/phy/intel,phy-thunderbay-emmc.yaml | 46 ++ + .../bindings/phy/microchip,lan966x-serdes.yaml | 59 ++ + .../devicetree/bindings/phy/phy-tegra194-p2u.txt | 28 - + .../devicetree/bindings/phy/phy-tegra194-p2u.yaml | 44 ++ + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 67 ++ + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 21 +- + .../bindings/phy/socionext,uniphier-pcie-phy.yaml | 1 + + .../phy/socionext,uniphier-usb3hs-phy.yaml | 1 + + .../phy/socionext,uniphier-usb3ss-phy.yaml | 1 + + MAINTAINERS | 7 + + drivers/phy/amlogic/Kconfig | 10 + + drivers/phy/amlogic/Makefile | 1 + + drivers/phy/amlogic/phy-meson8-hdmi-tx.c | 160 +++++ + drivers/phy/broadcom/phy-bcm-ns-usb2.c | 54 +- + drivers/phy/cadence/phy-cadence-torrent.c | 6 +- + drivers/phy/intel/Kconfig | 10 + + drivers/phy/intel/Makefile | 1 + + drivers/phy/intel/phy-intel-thunderbay-emmc.c | 509 ++++++++++++++++ + drivers/phy/microchip/Kconfig | 8 + + drivers/phy/microchip/Makefile | 1 + + drivers/phy/microchip/lan966x_serdes.c | 552 +++++++++++++++++ + drivers/phy/microchip/lan966x_serdes_regs.h | 209 +++++++ + drivers/phy/phy-can-transceiver.c | 4 +- + drivers/phy/qualcomm/Kconfig | 10 + + drivers/phy/qualcomm/Makefile | 1 + + drivers/phy/qualcomm/phy-qcom-edp.c | 674 +++++++++++++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp.h | 1 + + drivers/phy/socionext/Kconfig | 2 +- + drivers/phy/socionext/phy-uniphier-ahci.c | 201 +++++- + drivers/phy/socionext/phy-uniphier-pcie.c | 70 ++- + drivers/phy/socionext/phy-uniphier-usb3hs.c | 4 + + drivers/phy/socionext/phy-uniphier-usb3ss.c | 4 + + drivers/phy/st/phy-stm32-usbphyc.c | 10 +- + include/dt-bindings/phy/phy-lan966x-serdes.h | 14 + + 35 files changed, 2784 insertions(+), 72 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson8-hdmi-tx-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/intel,phy-thunderbay-emmc.yaml + create mode 100644 Documentation/devicetree/bindings/phy/microchip,lan966x-serdes.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-tegra194-p2u.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-tegra194-p2u.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml + create mode 100644 drivers/phy/amlogic/phy-meson8-hdmi-tx.c + create mode 100644 drivers/phy/intel/phy-intel-thunderbay-emmc.c + create mode 100644 drivers/phy/microchip/lan966x_serdes.c + create mode 100644 drivers/phy/microchip/lan966x_serdes_regs.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-edp.c + create mode 100644 include/dt-bindings/phy/phy-lan966x-serdes.h +Merging soundwire/next (bb349fd2d580 soundwire: qcom: remove redundant version number read) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'recursive' strategy. + drivers/soundwire/qcom.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) +Merging thunderbolt/next (d58071a8a76d Linux 5.16-rc3) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging vfio/next (3bf1311f351e vfio/ccw: Convert to use vfio_register_emulated_iommu_dev()) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (c601ab0eb478 staging: r8188eu: Fix coding style error) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/staging/rtl8192e/rtllib_softmac.c +Removing drivers/staging/ralink-gdma/ralink-gdma.c +Removing drivers/staging/ralink-gdma/Makefile +Removing drivers/staging/ralink-gdma/Kconfig +Removing drivers/staging/r8188eu/include/ieee80211_ext.h +Removing drivers/staging/mt7621-dma/hsdma-mt7621.c +Removing drivers/staging/mt7621-dma/TODO +Removing drivers/staging/mt7621-dma/Makefile +Removing drivers/staging/mt7621-dma/Kconfig +Removing drivers/staging/fbtft/fb_watterott.c +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 4 - + drivers/staging/Makefile | 2 - + drivers/staging/fbtft/Kconfig | 6 - + drivers/staging/fbtft/Makefile | 1 - + drivers/staging/fbtft/fb_sh1106.c | 7 +- + drivers/staging/fbtft/fb_watterott.c | 302 ------- + drivers/staging/fbtft/fbtft.h | 41 + + drivers/staging/mt7621-dma/Kconfig | 7 - + drivers/staging/mt7621-dma/Makefile | 4 - + drivers/staging/mt7621-dma/TODO | 5 - + drivers/staging/mt7621-dma/hsdma-mt7621.c | 758 ----------------- + drivers/staging/mt7621-dts/mt7621.dtsi | 38 - + drivers/staging/pi433/rf69.c | 38 +- + drivers/staging/r8188eu/core/rtw_ap.c | 7 +- + drivers/staging/r8188eu/core/rtw_br_ext.c | 11 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 8 +- + drivers/staging/r8188eu/core/rtw_efuse.c | 221 +---- + drivers/staging/r8188eu/core/rtw_ieee80211.c | 73 +- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 19 +- + drivers/staging/r8188eu/core/rtw_led.c | 106 ++- + drivers/staging/r8188eu/core/rtw_mlme.c | 12 +- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 77 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 13 +- + drivers/staging/r8188eu/core/rtw_rf.c | 2 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 23 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 2 +- + drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c | 10 +- + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 155 +--- + drivers/staging/r8188eu/hal/odm.c | 16 +- + drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 2 +- + drivers/staging/r8188eu/hal/odm_interface.c | 30 - + drivers/staging/r8188eu/hal/rtl8188e_dm.c | 4 - + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 907 +------------------- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 111 +-- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 6 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 140 +--- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 10 +- + drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 10 - + drivers/staging/r8188eu/include/HalPhyRf_8188e.h | 5 - + drivers/staging/r8188eu/include/HalVerDef.h | 12 - + drivers/staging/r8188eu/include/drv_types.h | 7 +- + drivers/staging/r8188eu/include/hal_intf.h | 12 +- + drivers/staging/r8188eu/include/ieee80211.h | 3 +- + drivers/staging/r8188eu/include/ieee80211_ext.h | 271 ------ + drivers/staging/r8188eu/include/odm.h | 73 +- + drivers/staging/r8188eu/include/odm_interface.h | 10 - + drivers/staging/r8188eu/include/osdep_service.h | 14 - + drivers/staging/r8188eu/include/rtl8188e_hal.h | 20 - + drivers/staging/r8188eu/include/rtl8188e_recv.h | 2 - + drivers/staging/r8188eu/include/rtl8188e_spec.h | 54 -- + drivers/staging/r8188eu/include/rtw_debug.h | 12 - + drivers/staging/r8188eu/include/rtw_efuse.h | 104 +-- + drivers/staging/r8188eu/include/rtw_io.h | 2 +- + drivers/staging/r8188eu/include/rtw_led.h | 16 +- + drivers/staging/r8188eu/include/rtw_recv.h | 1 - + drivers/staging/r8188eu/include/rtw_rf.h | 10 - + drivers/staging/r8188eu/include/usb_osintf.h | 1 - + drivers/staging/r8188eu/include/wifi.h | 57 -- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 31 +- + drivers/staging/r8188eu/os_dep/os_intfs.c | 61 +- + drivers/staging/r8188eu/os_dep/usb_intf.c | 29 +- + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 6 +- + drivers/staging/ralink-gdma/Kconfig | 8 - + drivers/staging/ralink-gdma/Makefile | 4 - + drivers/staging/ralink-gdma/ralink-gdma.c | 917 --------------------- + drivers/staging/rtl8192e/rtllib.h | 2 +- + drivers/staging/rtl8192e/rtllib_module.c | 17 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 6 +- + drivers/staging/rtl8192u/r8192U_core.c | 13 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 14 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 2 +- + drivers/staging/unisys/visornic/visornic_main.c | 8 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 2 - + drivers/staging/vt6655/card.c | 36 +- + drivers/staging/vt6655/channel.c | 2 +- + drivers/staging/vt6655/device.h | 8 +- + drivers/staging/vt6655/device_main.c | 12 +- + drivers/staging/vt6655/dpc.c | 2 +- + drivers/staging/vt6655/rf.c | 54 +- + drivers/staging/vt6655/rf.h | 2 +- + drivers/staging/wlan-ng/prism2mib.c | 8 - + 82 files changed, 446 insertions(+), 4675 deletions(-) + delete mode 100644 drivers/staging/fbtft/fb_watterott.c + delete mode 100644 drivers/staging/mt7621-dma/Kconfig + delete mode 100644 drivers/staging/mt7621-dma/Makefile + delete mode 100644 drivers/staging/mt7621-dma/TODO + delete mode 100644 drivers/staging/mt7621-dma/hsdma-mt7621.c + delete mode 100644 drivers/staging/r8188eu/include/ieee80211_ext.h + delete mode 100644 drivers/staging/ralink-gdma/Kconfig + delete mode 100644 drivers/staging/ralink-gdma/Makefile + delete mode 100644 drivers/staging/ralink-gdma/ralink-gdma.c +Merging iio/togreg (1d9b750c92d7 iio: test: Add test for IIO_VAL_INT_64.) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging drivers/iio/trigger/stm32-timer-trigger.c +Auto-merging drivers/iio/light/ltr501.c +Auto-merging drivers/iio/adc/stm32-adc.c +Auto-merging drivers/iio/adc/at91-sama5d2_adc.c +Auto-merging drivers/iio/accel/mma8452.c +Auto-merging drivers/iio/accel/kxcjk-1013.c +Merge made by the 'recursive' strategy. + drivers/iio/accel/bma180.c | 2 +- + drivers/iio/accel/bma220_spi.c | 6 +- + drivers/iio/accel/kxcjk-1013.c | 3 +- + drivers/iio/accel/mma7455_core.c | 3 +- + drivers/iio/accel/mma7660.c | 8 +- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/accel/mma9553.c | 2 +- + drivers/iio/accel/sca3000.c | 17 ++- + drivers/iio/accel/stk8312.c | 2 +- + drivers/iio/accel/stk8ba50.c | 3 +- + drivers/iio/adc/ad7192.c | 3 +- + drivers/iio/adc/ad7266.c | 3 +- + drivers/iio/adc/ad_sigma_delta.c | 4 - + drivers/iio/adc/at91-sama5d2_adc.c | 38 +++---- + drivers/iio/adc/hi8435.c | 2 +- + drivers/iio/adc/imx7d_adc.c | 5 +- + drivers/iio/adc/ina2xx-adc.c | 11 +- + drivers/iio/adc/lpc18xx_adc.c | 6 +- + drivers/iio/adc/rzg2l_adc.c | 4 +- + drivers/iio/adc/stm32-adc.c | 3 +- + drivers/iio/adc/ti-adc12138.c | 3 +- + drivers/iio/adc/ti-ads1015.c | 8 +- + drivers/iio/adc/xilinx-xadc-core.c | 64 +++++++---- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 2 +- + drivers/iio/chemical/atlas-sensor.c | 4 - + drivers/iio/common/scmi_sensors/scmi_iio.c | 57 +++++++++- + drivers/iio/common/st_sensors/st_sensors_core.c | 4 +- + drivers/iio/dac/ad5064.c | 4 +- + drivers/iio/dac/ad5380.c | 2 +- + drivers/iio/dac/ad5446.c | 2 +- + drivers/iio/dac/ad5504.c | 2 +- + drivers/iio/dac/ad5624r_spi.c | 2 +- + drivers/iio/dac/ad5686.c | 2 +- + drivers/iio/dac/ad5766.c | 13 +-- + drivers/iio/dac/ad5791.c | 2 +- + drivers/iio/dac/max5821.c | 2 +- + drivers/iio/dac/mcp4725.c | 8 +- + drivers/iio/dac/stm32-dac.c | 2 +- + drivers/iio/dac/ti-dac082s085.c | 2 +- + drivers/iio/dac/ti-dac5571.c | 2 +- + drivers/iio/dac/ti-dac7311.c | 2 +- + drivers/iio/health/afe4403.c | 5 - + drivers/iio/health/afe4404.c | 5 - + drivers/iio/iio_core.h | 2 +- + drivers/iio/industrialio-buffer.c | 20 ++-- + drivers/iio/industrialio-core.c | 5 +- + drivers/iio/light/gp2ap020a00f.c | 5 - + drivers/iio/light/ltr501.c | 17 ++- + drivers/iio/magnetometer/hmc5843_core.c | 4 +- + drivers/iio/magnetometer/mag3110.c | 6 +- + drivers/iio/potentiostat/lmp91000.c | 4 - + drivers/iio/pressure/mpl3115.c | 16 ++- + drivers/iio/pressure/ms5611.h | 6 +- + drivers/iio/pressure/ms5611_core.c | 7 +- + drivers/iio/pressure/ms5611_i2c.c | 11 +- + drivers/iio/pressure/ms5611_spi.c | 17 ++- + drivers/iio/proximity/as3935.c | 4 - + drivers/iio/test/iio-test-format.c | 123 ++++++++++++++++----- + drivers/iio/trigger/iio-trig-interrupt.c | 4 - + drivers/iio/trigger/iio-trig-sysfs.c | 4 - + drivers/iio/trigger/stm32-timer-trigger.c | 4 +- + include/linux/iio/buffer-dma.h | 5 - + include/linux/iio/iio.h | 5 +- + include/linux/iio/types.h | 1 + + 64 files changed, 357 insertions(+), 239 deletions(-) +Merging mux/for-next (aff1016220a5 dt-bindings: ti-serdes-mux: Add defines for J721S2 SoC) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Merge made by the 'recursive' strategy. + include/dt-bindings/mux/ti-serdes.h | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) +Merging icc/icc-next (78e488c462e5 Merge branch 'icc-msm8996' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Removing Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml +Merge made by the 'recursive' strategy. + .../bindings/interconnect/qcom,osm-l3.yaml | 1 + + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 143 +- + .../bindings/interconnect/qcom,sdm660.yaml | 185 -- + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/icc-rpm.c | 7 + + drivers/interconnect/qcom/icc-rpm.h | 1 + + drivers/interconnect/qcom/icc-rpmh.c | 10 +- + drivers/interconnect/qcom/msm8996.c | 2103 ++++++++++++++++++++ + drivers/interconnect/qcom/msm8996.h | 149 ++ + drivers/interconnect/qcom/osm-l3.c | 20 +- + drivers/interconnect/qcom/sc7280.h | 2 + + drivers/interconnect/qcom/sm8150.c | 1 - + drivers/interconnect/qcom/sm8250.c | 1 - + drivers/interconnect/qcom/sm8350.c | 1 - + include/dt-bindings/interconnect/qcom,msm8996.h | 163 ++ + 16 files changed, 2597 insertions(+), 201 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml + create mode 100644 drivers/interconnect/qcom/msm8996.c + create mode 100644 drivers/interconnect/qcom/msm8996.h + create mode 100644 include/dt-bindings/interconnect/qcom,msm8996.h +Merging dmaengine/next (7eafa6eed7f1 dmaengine: ppc4xx: remove unused variable `rval') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging drivers/dma/idxd/irq.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/dmaengine/dmatest.rst | 17 +- + Documentation/driver-api/dmaengine/provider.rst | 23 +++ + drivers/dma/dmaengine.c | 7 + + drivers/dma/idxd/device.c | 24 ++- + drivers/dma/idxd/dma.c | 28 ++- + drivers/dma/idxd/idxd.h | 21 ++- + drivers/dma/idxd/init.c | 96 +++++----- + drivers/dma/idxd/irq.c | 234 +++++++++++++++++++++++- + drivers/dma/idxd/registers.h | 1 + + drivers/dma/idxd/submit.c | 32 ++-- + drivers/dma/idxd/sysfs.c | 1 - + drivers/dma/ppc4xx/adma.c | 3 +- + drivers/dma/qcom/gpi.c | 4 +- + drivers/dma/ti/edma.c | 3 +- + drivers/dma/xilinx/xilinx_dma.c | 122 ++++++++++++ + include/linux/dmaengine.h | 20 ++ + 16 files changed, 536 insertions(+), 100 deletions(-) +Merging cgroup/for-next (e14da77113bb cgroup: Trace event cgroup id fields should be u64) +$ 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 'recursive' strategy. + include/linux/cgroup-defs.h | 2 +- + include/trace/events/cgroup.h | 12 ++++++------ + kernel/cgroup/cgroup.c | 2 +- + kernel/cgroup/rstat.c | 2 +- + 4 files changed, 9 insertions(+), 9 deletions(-) +Merging scsi/for-next (d08adc366f2d Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/ufs/ufshpb.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_error.c +Merge made by the 'recursive' strategy. + drivers/scsi/a100u2w.c | 2 - + drivers/scsi/atp870u.c | 1 - + drivers/scsi/bfa/bfad_attr.c | 2 +- + drivers/scsi/dc395x.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas.h | 1 - + drivers/scsi/hosts.c | 15 +--- + drivers/scsi/initio.c | 2 - + drivers/scsi/libsas/sas_discover.c | 1 - + drivers/scsi/megaraid/megaraid_mbox.c | 1 - + drivers/scsi/pm8001/Makefile | 7 +- + drivers/scsi/pm8001/pm8001_ctl.c | 24 +++---- + drivers/scsi/pm8001/pm8001_hwi.c | 33 ++++----- + drivers/scsi/pm8001/pm8001_init.c | 4 +- + drivers/scsi/pm8001/pm8001_sas.c | 16 +++++ + drivers/scsi/pm8001/pm80xx_hwi.c | 38 +++++------ + drivers/scsi/pm8001/pm80xx_tracepoints.c | 10 +++ + drivers/scsi/pm8001/pm80xx_tracepoints.h | 113 +++++++++++++++++++++++++++++++ + drivers/scsi/pmcraid.c | 1 - + drivers/scsi/qedi/qedi_main.c | 3 - + drivers/scsi/scsi.c | 1 - + drivers/scsi/scsi_debugfs.c | 1 + + drivers/scsi/scsi_error.c | 112 +++++++++++++++--------------- + drivers/scsi/scsi_pm.c | 1 - + drivers/scsi/scsi_priv.h | 3 +- + drivers/scsi/scsi_scan.c | 4 +- + drivers/scsi/scsi_sysfs.c | 7 +- + drivers/scsi/sd.c | 1 - + drivers/scsi/ufs/Kconfig | 15 ++-- + drivers/scsi/ufs/ufs-hisi.c | 8 ++- + drivers/scsi/ufs/ufshcd.c | 45 ++++++++++-- + drivers/scsi/ufs/ufshcd.h | 11 +++ + drivers/scsi/ufs/ufshpb.c | 1 - + include/scsi/scsi_host.h | 6 -- + 33 files changed, 324 insertions(+), 169 deletions(-) + create mode 100644 drivers/scsi/pm8001/pm80xx_tracepoints.c + create mode 100644 drivers/scsi/pm8001/pm80xx_tracepoints.h +Merging scsi-mkp/for-next (bf3f120fd61c scsi: sd_zbc: Clean up sd_zbc_parse_report() setting of wp) +$ 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/sd_zbc.c +Merge made by the 'recursive' strategy. + drivers/scsi/sd_zbc.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging vhost/linux-next (4bd5d4c69825 iommu/virtio: Support identity-mapped domains) +$ 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 'recursive' strategy. + drivers/iommu/virtio-iommu.c | 113 +++++++++++++++++++++++++++++++------- + include/uapi/linux/virtio_iommu.h | 8 ++- + 2 files changed, 101 insertions(+), 20 deletions(-) +Merging rpmsg/for-next (c4b39a582b9b 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 'recursive' strategy. + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 3 +++ + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 8 +++++--- + drivers/remoteproc/imx_rproc.c | 1 + + drivers/remoteproc/remoteproc_core.c | 4 ++-- + drivers/remoteproc/remoteproc_coredump.c | 2 +- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 1 + + drivers/remoteproc/ti_k3_r5_remoteproc.c | 5 +++-- + drivers/rpmsg/qcom_glink_native.c | 2 +- + drivers/rpmsg/qcom_smd.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 7 +++++-- + drivers/rpmsg/rpmsg_core.c | 24 +++++++++++----------- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + 12 files changed, 36 insertions(+), 25 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 (e320d9c2e900 gpio: xlp: Fix build errors from Netlogic XLP removal) +$ 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/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-vf610.yaml | 3 + + .../devicetree/bindings/gpio/sifive,gpio.yaml | 3 +- + drivers/gpio/Kconfig | 10 +- + drivers/gpio/gpio-aggregator.c | 11 +- + drivers/gpio/gpio-rockchip.c | 18 +++ + drivers/gpio/gpio-xlp.c | 147 ++------------------- + drivers/gpio/gpiolib.c | 6 +- + 7 files changed, 49 insertions(+), 149 deletions(-) +Merging gpio-intel/for-next (e1610431b95c gpio: dwapb: clarify usage of the register file version) +$ 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 +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-dwapb.c | 10 +++++---- + drivers/gpio/gpio-ml-ioh.c | 52 +++++++++++++++++++++---------------------- + drivers/gpio/gpio-pch.c | 42 +++++++++++++++++----------------- + drivers/gpio/gpiolib-acpi.c | 51 ++++++++++++++++++------------------------ + include/linux/gpio/consumer.h | 2 -- + 5 files changed, 74 insertions(+), 83 deletions(-) +Merging gpio-sim/gpio/gpio-sim (5065e08e4ef3 gpio: sim: fix missing unlock on error in gpio_sim_config_commit_item()) +$ 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 +Auto-merging tools/testing/selftests/gpio/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/gpio/Makefile +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Resolved 'tools/testing/selftests/gpio/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 55a32fe4071d] Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/gpio/gpio-sim.rst | 72 +++ + Documentation/filesystems/configfs.rst | 6 +- + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-sim.c | 884 ++++++++++++++++++++++++++ + fs/configfs/configfs_internal.h | 22 +- + fs/configfs/dir.c | 276 +++++++- + include/linux/configfs.h | 3 +- + samples/configfs/configfs_sample.c | 153 +++++ + tools/testing/selftests/gpio/.gitignore | 2 + + tools/testing/selftests/gpio/Makefile | 4 +- + tools/testing/selftests/gpio/config | 1 + + tools/testing/selftests/gpio/gpio-chip-info.c | 57 ++ + tools/testing/selftests/gpio/gpio-line-name.c | 55 ++ + tools/testing/selftests/gpio/gpio-sim.sh | 229 +++++++ + 15 files changed, 1750 insertions(+), 23 deletions(-) + create mode 100644 Documentation/admin-guide/gpio/gpio-sim.rst + create mode 100644 drivers/gpio/gpio-sim.c + create mode 100644 tools/testing/selftests/gpio/gpio-chip-info.c + create mode 100644 tools/testing/selftests/gpio/gpio-line-name.c + create mode 100755 tools/testing/selftests/gpio/gpio-sim.sh +Merging pinctrl/for-next (ce646c7757d3 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 +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/actions,s500-pinctrl.yaml | 3 + + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 1 + + .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 3 + + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 3 + + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 3 + + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6318-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm63268-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6328-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6358-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6362-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,bcm6368-pinctrl.yaml | 3 + + .../bindings/pinctrl/brcm,ns-pinmux.yaml | 3 +- + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 7 +- + .../bindings/pinctrl/cirrus,lochnagar.yaml | 3 + + .../devicetree/bindings/pinctrl/cirrus,madera.yaml | 3 + + .../bindings/pinctrl/fsl,imx8mm-pinctrl.yaml | 3 + + .../bindings/pinctrl/fsl,imx8mn-pinctrl.yaml | 3 + + .../bindings/pinctrl/fsl,imx8mp-pinctrl.yaml | 3 + + .../bindings/pinctrl/fsl,imx8mq-pinctrl.yaml | 3 + + .../bindings/pinctrl/fsl,imx8ulp-pinctrl.yaml | 3 + + .../devicetree/bindings/pinctrl/fsl,imxrt1050.yaml | 79 ++ + .../bindings/pinctrl/ingenic,pinctrl.yaml | 8 +- + .../devicetree/bindings/pinctrl/intel,lgm-io.yaml | 3 + + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt6797-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 3 + + .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 3 + + .../bindings/pinctrl/mscc,ocelot-pinctrl.txt | 3 +- + .../devicetree/bindings/pinctrl/pincfg-node.yaml | 3 + + .../bindings/pinctrl/pinctrl-bindings.txt | 41 +- + .../bindings/pinctrl/pinctrl-mt8192.yaml | 3 + + .../bindings/pinctrl/pinctrl-mt8195.yaml | 3 + + .../devicetree/bindings/pinctrl/pinctrl.yaml | 45 + + .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,lpass-lpi-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,mdm9607-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 3 + + .../bindings/pinctrl/qcom,qcm2290-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sc8180x-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sm6115-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sm6125-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,sm6350-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,sm8350-pinctrl.yaml | 1 + + .../bindings/pinctrl/qcom,tlmm-common.yaml | 3 + + .../bindings/pinctrl/ralink,rt2880-pinmux.yaml | 3 + + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 3 + + .../bindings/pinctrl/renesas,rza1-ports.yaml | 3 + + .../bindings/pinctrl/renesas,rza2-pinctrl.yaml | 3 + + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 5 + + .../bindings/pinctrl/renesas,rzn1-pinctrl.yaml | 3 + + .../bindings/pinctrl/rockchip,pinctrl.yaml | 3 + + .../pinctrl/socionext,uniphier-pinctrl.yaml | 44 +- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 3 + + .../bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 5 +- + .../bindings/pinctrl/xlnx,zynq-pinctrl.yaml | 3 + + .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 3 + + drivers/gpio/gpio-mockup.c | 23 +- + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imxrt1050.c | 349 ++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 10 +- + drivers/pinctrl/mediatek/pinctrl-paris.c | 2 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 85 +- + drivers/pinctrl/pinconf-generic.c | 2 + + drivers/pinctrl/pinctrl-apple-gpio.c | 105 +-- + drivers/pinctrl/pinctrl-microchip-sgpio.c | 45 +- + drivers/pinctrl/pinctrl-ocelot.c | 485 ++++++++++- + drivers/pinctrl/pinctrl-rockchip.c | 161 ++-- + drivers/pinctrl/pinctrl-st.c | 116 ++- + drivers/pinctrl/pinctrl-zynqmp.c | 10 +- + drivers/pinctrl/qcom/Kconfig | 9 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 15 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 10 + + drivers/pinctrl/qcom/pinctrl-sc7280.c | 75 +- + drivers/pinctrl/qcom/pinctrl-sdx65.c | 967 +++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 + + drivers/pinctrl/renesas/pinctrl-rza1.c | 6 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 310 ++++--- + drivers/pinctrl/renesas/pinctrl.c | 9 +- + drivers/pinctrl/spear/pinctrl-plgpio.c | 148 ++-- + drivers/pinctrl/spear/pinctrl-spear.c | 10 +- + drivers/pinctrl/spear/pinctrl-spear.h | 12 +- + include/linux/pinctrl/pinconf-generic.h | 3 + + include/linux/string_helpers.h | 4 + + lib/string_helpers.c | 64 ++ + 94 files changed, 2857 insertions(+), 579 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imxrt1050.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl.yaml + create mode 100644 drivers/pinctrl/freescale/pinctrl-imxrt1050.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sdx65.c +Merging pinctrl-intel/for-next (db1b2a8caf5b pinctrl: cherryview: Use temporary variable for struct device) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 2 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 130 ++++++++++++++++++++++------- + 2 files changed, 100 insertions(+), 32 deletions(-) +Merging pinctrl-renesas/renesas-pinctrl (7c50a407b868 pinctrl: renesas: Remove unneeded locking around sh_pfc_read() calls) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (16dd3bb5c190 pinctrl: samsung: Make symbol 'exynos7885_pin_ctrl' static) +$ 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 'recursive' strategy. + .../bindings/pinctrl/samsung-pinctrl.txt | 1 + + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 81 ++++++++++++++++++++++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + 4 files changed, 85 insertions(+) +Merging pwm/for-next (b6ce2af8766c pwm: img: Use only a single idiom to get a runtime PM reference) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Auto-merging drivers/pwm/core.c +Merge made by the 'recursive' strategy. + drivers/pwm/core.c | 139 +++++++++++++++++++++++++++-------------------- + drivers/pwm/pwm-img.c | 35 +++++++++--- + drivers/pwm/pwm-twl.c | 62 ++++++++++++++++++--- + drivers/pwm/pwm-vt8500.c | 57 ++++++++++++++++--- + 4 files changed, 211 insertions(+), 82 deletions(-) +Merging userns/for-next (9d3f401c52e3 Merge SA_IMMUTABLE-fixes-for-v5.16-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Merge made by the 'recursive' strategy. + fs/signalfd.c | 5 +++-- + include/linux/sched/signal.h | 7 ++++--- + kernel/signal.c | 44 ++++++++++++++++++++++++++------------------ + 3 files changed, 33 insertions(+), 23 deletions(-) +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 (60726e868227 selftests/ftrace: make kprobe profile testcase description unique) +$ 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 'recursive' strategy. + tools/testing/selftests/clone3/clone3.c | 6 ++++++ + tools/testing/selftests/ftrace/test.d/kprobe/profile.tc | 2 +- + tools/testing/selftests/timers/alarmtimer-suspend.c | 2 +- + tools/testing/selftests/timers/inconsistency-check.c | 2 +- + 4 files changed, 9 insertions(+), 3 deletions(-) +Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging coresight/next (f9809d565135 Documentation: coresight: Update coresight configuration docs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Auto-merging samples/Makefile +Auto-merging samples/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/trace/coresight/coresight-config.rst | 78 ++++- + MAINTAINERS | 1 + + .../hwtracing/coresight/coresight-cfg-preload.c | 9 +- + drivers/hwtracing/coresight/coresight-config.h | 9 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 11 +- + drivers/hwtracing/coresight/coresight-stm.c | 10 +- + .../coresight/coresight-syscfg-configfs.c | 87 ++++++ + .../coresight/coresight-syscfg-configfs.h | 4 + + drivers/hwtracing/coresight/coresight-syscfg.c | 315 +++++++++++++++++++-- + drivers/hwtracing/coresight/coresight-syscfg.h | 39 ++- + samples/Kconfig | 9 + + samples/Makefile | 1 + + samples/coresight/Makefile | 4 + + samples/coresight/coresight-cfg-sample.c | 73 +++++ + 14 files changed, 594 insertions(+), 56 deletions(-) + create mode 100644 samples/coresight/Makefile + create mode 100644 samples/coresight/coresight-cfg-sample.c +Merging rtc/rtc-next (5c0189a8b52f rtc: rv8803: Add support for the Epson RX8804 RTC) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/epson,rx8900.yaml | 1 + + drivers/rtc/rtc-da9063.c | 16 ++-- + drivers/rtc/rtc-pcf85063.c | 97 +++++++++++++++------- + drivers/rtc/rtc-rs5c372.c | 55 ++++++++++++ + drivers/rtc/rtc-rv8803.c | 6 ++ + 5 files changed, 138 insertions(+), 37 deletions(-) +Merging nvdimm/libnvdimm-for-next (e765f13ed126 nvdimm/pmem: move dax_attribute_group from dax to pmem) +$ 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 (92e1764787e5 eeprom: at24: remove struct at24_client) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Merge made by the 'recursive' strategy. + drivers/misc/eeprom/at24.c | 53 ++++++++++++++++------------------------------ + 1 file changed, 18 insertions(+), 35 deletions(-) +Merging ntb/ntb-next (f96cb827ce49 ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'recursive' strategy. +Merging seccomp/for-next/seccomp (1e6d69c7b9cd selftests/seccomp: Report event mismatches more clearly) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Merge made by the 'recursive' strategy. + tools/testing/selftests/seccomp/seccomp_bpf.c | 56 ++++++++++++++++++++++++--- + 1 file changed, 50 insertions(+), 6 deletions(-) +Merging kspp/for-next/kspp (879f756fa9bf Merge branches 'for-next/hardening', 'for-next/overflow' and 'for-next/thread_info/cpu' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging kspp-gustavo/for-next/kspp (64bc5a949ae1 Merge branch 'for-linus/kspp' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 5 +++++ + arch/mips/mm/tlbex.c | 1 + + drivers/video/fbdev/sh7760fb.c | 2 ++ + 3 files changed, 8 insertions(+) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging gnss/gnss-next (b15c90153fd9 gnss: drop stray semicolons) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Merge made by the 'recursive' strategy. + drivers/gnss/mtk.c | 2 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/gnss/ubx.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging fsi/next (7cc2f34e1f4d fsi: sbefifo: Use interruptible mutex locking) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (42f65ea5a727 nvmem: mtk-efuse: support minimum one byte access stride and granularity) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/nvmem/mtk-efuse.txt | 2 ++ + drivers/nvmem/mtk-efuse.c | 13 +++++++------ + 2 files changed, 9 insertions(+), 6 deletions(-) +Merging xarray/main (f2aa11fd5144 tools: Fix math.h breakage) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Merge made by the 'recursive' strategy. + Documentation/core-api/idr.rst | 2 ++ + Documentation/core-api/xarray.rst | 1 + + lib/test_xarray.c | 6 ++++++ + lib/xarray.c | 4 ++++ + 4 files changed, 13 insertions(+) +Merging hyperv/hyperv-next (285f68afa8b2 x86/hyperv: Protect set_hv_tscchange_cb() against getting preempted) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +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 +Merge made by the 'recursive' strategy. + drivers/auxdisplay/charlcd.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +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 (ea59fc1beff1 fpga: stratix10-soc: Do not use ret uninitialized in s10_probe()) +$ 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 'recursive' strategy. + Documentation/driver-api/fpga/fpga-bridge.rst | 6 +- + Documentation/driver-api/fpga/fpga-mgr.rst | 38 +++-- + Documentation/driver-api/fpga/fpga-region.rst | 12 +- + drivers/fpga/altera-cvp.c | 12 +- + drivers/fpga/altera-fpga2sdram.c | 12 +- + drivers/fpga/altera-freeze-bridge.c | 10 +- + drivers/fpga/altera-hps2fpga.c | 12 +- + drivers/fpga/altera-pr-ip-core.c | 7 +- + drivers/fpga/altera-ps-spi.c | 9 +- + drivers/fpga/dfl-fme-br.c | 10 +- + drivers/fpga/dfl-fme-mgr.c | 22 ++- + drivers/fpga/dfl-fme-region.c | 17 +- + drivers/fpga/dfl.c | 12 +- + drivers/fpga/fpga-bridge.c | 122 ++++----------- + drivers/fpga/fpga-mgr.c | 215 +++++++++++--------------- + drivers/fpga/fpga-region.c | 119 ++++++-------- + drivers/fpga/ice40-spi.c | 9 +- + drivers/fpga/machxo2-spi.c | 9 +- + drivers/fpga/of-fpga-region.c | 10 +- + drivers/fpga/socfpga-a10.c | 16 +- + drivers/fpga/socfpga.c | 9 +- + drivers/fpga/stratix10-soc.c | 18 +-- + drivers/fpga/ts73xx-fpga.c | 9 +- + drivers/fpga/versal-fpga.c | 9 +- + drivers/fpga/xilinx-pr-decoupler.c | 17 +- + drivers/fpga/xilinx-spi.c | 11 +- + drivers/fpga/zynq-fpga.c | 16 +- + drivers/fpga/zynqmp-fpga.c | 9 +- + include/linux/fpga/fpga-bridge.h | 30 ++-- + include/linux/fpga/fpga-mgr.h | 62 +++++--- + include/linux/fpga/fpga-region.h | 36 +++-- + 31 files changed, 387 insertions(+), 518 deletions(-) +Merging kunit/test (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging cfi/cfi/next (baaf965f9430 mtd: hyperbus: rpc-if: fix bug in rpcif_hb_remove) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Auto-merging drivers/mtd/hyperbus/rpc-if.c +Merge made by the 'recursive' strategy. + drivers/mtd/hyperbus/rpc-if.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +Merging kunit-next/kunit (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (46827f596963 bus: mhi: pci_generic: Simplify code and axe the use of a deprecated API) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Auto-merging drivers/bus/mhi/pci_generic.c +Merge made by the 'recursive' strategy. + drivers/bus/mhi/core/boot.c | 2 +- + drivers/bus/mhi/core/internal.h | 3 ++- + drivers/bus/mhi/core/main.c | 3 ++- + drivers/bus/mhi/core/pm.c | 4 ++-- + drivers/bus/mhi/pci_generic.c | 13 +++++-------- + 5 files changed, 12 insertions(+), 13 deletions(-) +Merging memblock/for-next (e888fa7bb882 memblock: Check memory add/cap ordering) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging rust/rust-next (988f45dfe7ea MAINTAINERS: Rust) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging tools/lib/perf/include/perf/event.h +Auto-merging scripts/kconfig/confdata.c +CONFLICT (content): Merge conflict in scripts/kconfig/confdata.c +Auto-merging scripts/Makefile.modfinal +CONFLICT (content): Merge conflict in scripts/Makefile.modfinal +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging samples/Kconfig +CONFLICT (content): Merge conflict in samples/Kconfig +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +Auto-merging kernel/kallsyms.c +Auto-merging init/Kconfig +Auto-merging include/linux/spinlock.h +Auto-merging include/linux/kallsyms.h +Auto-merging arch/riscv/Makefile +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/process/changes.rst +CONFLICT (content): Merge conflict in Documentation/process/changes.rst +Auto-merging Documentation/index.rst +Resolved 'Documentation/process/changes.rst' using previous resolution. +Resolved 'Makefile' using previous resolution. +Resolved 'samples/Kconfig' using previous resolution. +Resolved 'samples/Makefile' using previous resolution. +Resolved 'scripts/Makefile.modfinal' using previous resolution. +Resolved 'scripts/kconfig/confdata.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d92527276538] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 4 + + Documentation/process/changes.rst | 13 + + Documentation/rust/arch-support.rst | 35 + + Documentation/rust/assets/favicon-16x16.png | Bin 0 -> 798 bytes + Documentation/rust/assets/favicon-32x32.png | Bin 0 -> 2076 bytes + Documentation/rust/assets/rust-logo.png | Bin 0 -> 53976 bytes + Documentation/rust/coding.rst | 92 + + Documentation/rust/docs.rst | 110 + + Documentation/rust/index.rst | 20 + + Documentation/rust/quick-start.rst | 218 ++ + MAINTAINERS | 14 + + Makefile | 153 +- + 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 + + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + init/Kconfig | 31 +- + kernel/kallsyms.c | 10 +- + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 5 +- + lib/Kconfig.debug | 144 ++ + lib/vsprintf.c | 12 + + rust/.gitignore | 7 + + rust/Makefile | 355 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 425 ++++ + rust/alloc/borrow.rs | 494 ++++ + rust/alloc/boxed.rs | 1789 +++++++++++++++ + rust/alloc/collections/mod.rs | 155 ++ + rust/alloc/fmt.rs | 587 +++++ + rust/alloc/lib.rs | 202 ++ + rust/alloc/macros.rs | 126 + + rust/alloc/prelude/mod.rs | 17 + + rust/alloc/prelude/v1.rs | 16 + + rust/alloc/raw_vec.rs | 609 +++++ + rust/alloc/slice.rs | 1271 +++++++++++ + rust/alloc/str.rs | 614 +++++ + rust/alloc/string.rs | 2845 +++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 157 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 303 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3295 +++++++++++++++++++++++++++ + 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 | 33 + + rust/compiler_builtins.rs | 57 + + rust/exports.c | 16 + + rust/helpers.c | 301 +++ + rust/kernel/allocator.rs | 63 + + rust/kernel/bindings.rs | 46 + + rust/kernel/bindings_helper.h | 25 + + rust/kernel/buffer.rs | 39 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 212 ++ + rust/kernel/error.rs | 523 +++++ + rust/kernel/file.rs | 131 ++ + rust/kernel/file_operations.rs | 715 ++++++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 207 ++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/lib.rs | 250 ++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 111 + + rust/kernel/module_param.rs | 497 ++++ + rust/kernel/of.rs | 101 + + rust/kernel/pages.rs | 162 ++ + rust/kernel/platdev.rs | 153 ++ + rust/kernel/power.rs | 118 + + rust/kernel/prelude.rs | 26 + + rust/kernel/print.rs | 441 ++++ + rust/kernel/random.rs | 50 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 562 +++++ + rust/kernel/security.rs | 56 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/std_vendor.rs | 150 ++ + rust/kernel/str.rs | 253 ++ + rust/kernel/sync/arc.rs | 480 ++++ + rust/kernel/sync/condvar.rs | 132 ++ + rust/kernel/sync/guard.rs | 91 + + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 80 + + rust/kernel/sync/mutex.rs | 101 + + rust/kernel/sync/spinlock.rs | 102 + + rust/kernel/sysctl.rs | 198 ++ + rust/kernel/task.rs | 182 ++ + rust/kernel/types.rs | 228 ++ + rust/kernel/user_ptr.rs | 175 ++ + rust/macros/helpers.rs | 79 + + rust/macros/lib.rs | 128 ++ + rust/macros/module.rs | 678 ++++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 113 + + samples/rust/Makefile | 12 + + samples/rust/rust_chrdev.rs | 51 + + samples/rust/rust_minimal.rs | 38 + + samples/rust/rust_miscdev.rs | 150 ++ + samples/rust/rust_module_parameters.rs | 72 + + samples/rust/rust_print.rs | 57 + + samples/rust/rust_random.rs | 61 + + samples/rust/rust_semaphore.rs | 177 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 40 + + samples/rust/rust_sync.rs | 81 + + scripts/Makefile.build | 22 + + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 10 +- + scripts/generate_rust_analyzer.py | 133 ++ + scripts/is_rust_module.sh | 19 + + scripts/kallsyms.c | 40 +- + scripts/rust-version.sh | 31 + + tools/include/linux/kallsyms.h | 2 +- + tools/include/linux/lockdep.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 131 files changed, 25442 insertions(+), 34 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/assets/favicon-16x16.png + create mode 100644 Documentation/rust/assets/favicon-32x32.png + create mode 100644 Documentation/rust/assets/rust-logo.png + create mode 100644 Documentation/rust/coding.rst + create mode 100644 Documentation/rust/docs.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 arch/arm/rust/target.json + create mode 100644 arch/arm64/rust/target.json + create mode 100644 arch/powerpc/rust/target.json + create mode 100644 arch/riscv/rust/rv32ima.json + create mode 100644 arch/riscv/rust/rv32imac.json + create mode 100644 arch/riscv/rust/rv64ima.json + create mode 100644 arch/riscv/rust/rv64imac.json + create mode 100644 arch/x86/rust/target.json + create mode 100644 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/prelude/mod.rs + create mode 100644 rust/alloc/prelude/v1.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/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/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/file_operations.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/lib.rs + create mode 100644 rust/kernel/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platdev.rs + create mode 100644 rust/kernel/power.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100644 rust/kernel/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/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/macros/helpers.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100755 scripts/is_rust_module.sh + create mode 100755 scripts/rust-version.sh +$ git am -3 ../patches/0001-Kbuild-fix-for-kbuild-split-DEBUG_CFLAGS-out-to-scri.patch +Applying: Kbuild: fix for "kbuild: split DEBUG_CFLAGS out to scripts/Makefile.debug" +$ git reset HEAD^ +Unstaged changes after reset: +M scripts/Makefile.debug +$ git add -A . +$ git commit -v -a --amend +[master 75ba06eae74a] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git + Date: Mon Dec 6 16:44:39 2021 +1100 +Merging cxl/next (53989fad1286 cxl/pmem: Fix module reload vs workqueue state) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging include/linux/acpi.h +Merge made by the 'recursive' strategy. + drivers/acpi/Kconfig | 3 + + drivers/acpi/numa/srat.c | 59 ++++++++++- + drivers/acpi/tables.c | 87 ++++++++++++---- + drivers/cxl/Kconfig | 1 + + drivers/cxl/acpi.c | 237 ++++++++++++++++-------------------------- + drivers/cxl/core/Makefile | 2 +- + drivers/cxl/core/bus.c | 20 ++-- + drivers/cxl/core/mbox.c | 186 ++++++++++++++++----------------- + drivers/cxl/core/memdev.c | 55 +++++----- + drivers/cxl/core/pmem.c | 20 ++-- + drivers/cxl/core/regs.c | 8 +- + drivers/cxl/cxl.h | 8 ++ + drivers/cxl/cxlmem.h | 37 ++++--- + drivers/cxl/pci.c | 120 ++++++++++----------- + drivers/cxl/pmem.c | 85 ++++++++++----- + include/linux/acpi.h | 34 ++++-- + tools/testing/cxl/Kbuild | 3 +- + tools/testing/cxl/test/cxl.c | 68 ++++++++---- + tools/testing/cxl/test/mem.c | 99 +++++++++++++----- + tools/testing/cxl/test/mock.c | 30 ++---- + tools/testing/cxl/test/mock.h | 6 +- + 21 files changed, 672 insertions(+), 496 deletions(-) +Merging folio/for-next (c03571399870 mm: Add functions to zero portions of a folio) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Already up to date. +Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string) +$ git merge -m Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git bitmap/bitmap-master-5.15 +Removing tools/include/asm-generic/bitops/find.h +Auto-merging mm/percpu.c +Auto-merging lib/vsprintf.c +Auto-merging kernel/time/clocksource.c +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/bitmap.h +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/f2fs/segment.c +Auto-merging drivers/tty/n_tty.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/pci/controller/dwc/pci-dra7xx.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/mmc/host/renesas_sdhi_core.c +Auto-merging drivers/infiniband/hw/irdma/hw.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +Auto-merging drivers/dma/ti/edma.c +CONFLICT (content): Merge conflict in drivers/dma/ti/edma.c +Auto-merging drivers/block/rnbd/rnbd-clt.c +Auto-merging block/blk-mq.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/include/asm/bitops.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/parisc/include/asm/bitops.h +CONFLICT (content): Merge conflict in arch/parisc/include/asm/bitops.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/include/asm/bitops.h +Auto-merging arch/csky/include/asm/bitops.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging MAINTAINERS +Resolved 'arch/parisc/include/asm/bitops.h' using previous resolution. +Resolved 'drivers/dma/ti/edma.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cbff28e87391] Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 +- + arch/alpha/include/asm/bitops.h | 2 - + arch/arc/Kconfig | 1 - + arch/arc/include/asm/bitops.h | 1 - + arch/arm/include/asm/bitops.h | 1 - + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/bitops.h | 1 - + arch/csky/include/asm/bitops.h | 1 - + arch/h8300/include/asm/bitops.h | 1 - + arch/hexagon/include/asm/bitops.h | 1 - + arch/ia64/include/asm/bitops.h | 2 - + arch/m68k/include/asm/bitops.h | 2 - + arch/mips/Kconfig | 1 - + arch/mips/include/asm/bitops.h | 1 - + arch/openrisc/include/asm/bitops.h | 1 - + arch/parisc/include/asm/bitops.h | 1 - + arch/powerpc/include/asm/bitops.h | 2 - + arch/powerpc/include/asm/cputhreads.h | 2 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 4 +- + arch/riscv/include/asm/bitops.h | 1 - + arch/s390/Kconfig | 1 - + arch/s390/include/asm/bitops.h | 1 - + arch/s390/kvm/kvm-s390.c | 2 +- + arch/sh/include/asm/bitops.h | 1 - + arch/sparc/include/asm/bitops_32.h | 1 - + arch/sparc/include/asm/bitops_64.h | 2 - + arch/x86/Kconfig | 1 - + arch/x86/include/asm/bitops.h | 2 - + arch/x86/kernel/apic/vector.c | 4 +- + arch/x86/um/Kconfig | 1 - + arch/xtensa/include/asm/bitops.h | 1 - + block/blk-mq.c | 2 +- + drivers/block/rnbd/rnbd-clt.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 +- + drivers/hwmon/ltc2992.c | 3 +- + drivers/iio/adc/ad7124.c | 2 +- + drivers/infiniband/hw/irdma/hw.c | 16 +- + drivers/media/cec/core/cec-core.c | 2 +- + drivers/media/mc/mc-devnode.c | 2 +- + drivers/mmc/host/renesas_sdhi_core.c | 2 +- + drivers/net/virtio_net.c | 2 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 10 +- + drivers/soc/fsl/qbman/bman_portal.c | 2 +- + drivers/soc/fsl/qbman/qman_portal.c | 2 +- + drivers/soc/ti/k3-ringacc.c | 4 +- + drivers/tty/n_tty.c | 2 +- + drivers/virt/acrn/ioreq.c | 3 +- + fs/f2fs/segment.c | 8 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/ocfs2/dlm/dlmdomain.c | 4 +- + fs/ocfs2/dlm/dlmmaster.c | 18 +- + fs/ocfs2/dlm/dlmrecovery.c | 2 +- + fs/ocfs2/dlm/dlmthread.c | 2 +- + include/asm-generic/bitops.h | 1 - + include/asm-generic/bitops/le.h | 64 ---- + include/linux/bitmap.h | 34 +- + include/linux/bitops.h | 34 -- + include/linux/cpumask.h | 46 ++- + include/linux/find.h | 372 +++++++++++++++++++++ + kernel/time/clocksource.c | 4 +- + lib/Kconfig | 3 - + lib/find_bit.c | 21 ++ + lib/find_bit_benchmark.c | 21 ++ + lib/genalloc.c | 2 +- + lib/test_bitmap.c | 37 ++ + lib/vsprintf.c | 24 +- + mm/percpu.c | 35 +- + net/ncsi/ncsi-manage.c | 4 +- + tools/include/asm-generic/bitops.h | 1 - + tools/include/asm-generic/bitops/find.h | 145 -------- + tools/include/linux/bitmap.h | 7 +- + .../bitops => tools/include/linux}/find.h | 54 ++- + tools/lib/find_bit.c | 20 ++ + 74 files changed, 636 insertions(+), 439 deletions(-) + create mode 100644 include/linux/find.h + delete mode 100644 tools/include/asm-generic/bitops/find.h + rename {include/asm-generic/bitops => tools/include/linux}/find.h (83%) +Merging zstd/zstd-next (fa55b7dcdc43 Linux 5.16-rc1) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (720dff78de36 efi: Allow efi=runtime) +$ 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 (e2a58d2d3416 unicode: only export internal symbols for the selftests) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Auto-merging fs/f2fs/sysfs.c +CONFLICT (content): Merge conflict in fs/f2fs/sysfs.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/ext4/super.c +Resolved 'fs/f2fs/sysfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 00f09a3b247d] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git +$ git diff -M --stat --summary HEAD^.. + fs/ext4/super.c | 39 ++- + fs/f2fs/super.c | 38 +-- + fs/f2fs/sysfs.c | 3 +- + fs/unicode/Kconfig | 13 +- + fs/unicode/Makefile | 13 +- + fs/unicode/mkutf8data.c | 24 +- + fs/unicode/utf8-core.c | 109 ++++----- + fs/unicode/utf8-norm.c | 262 +++------------------ + fs/unicode/utf8-selftest.c | 94 ++++---- + .../{utf8data.h_shipped => utf8data.c_shipped} | 22 +- + fs/unicode/utf8n.h | 81 +++---- + include/linux/unicode.h | 49 +++- + 12 files changed, 291 insertions(+), 456 deletions(-) + rename fs/unicode/{utf8data.h_shipped => utf8data.c_shipped} (99%) +Merging slab/slab-next (d395d823b3ae bootmem: Use page->index instead of page->freelist) +$ git merge -m Merge branch 'slab-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/linux.git slab/slab-next +Auto-merging include/linux/slab.h +Auto-merging include/linux/mm.h +Merge made by the 'recursive' strategy. + arch/x86/mm/init_64.c | 2 +- + include/linux/bootmem_info.h | 2 +- + include/linux/kasan.h | 9 +- + include/linux/memcontrol.h | 48 -- + include/linux/mm.h | 12 + + include/linux/mm_types.h | 10 +- + include/linux/slab.h | 8 - + include/linux/slab_def.h | 16 +- + include/linux/slub_def.h | 29 +- + mm/bootmem_info.c | 7 +- + mm/kasan/common.c | 27 +- + mm/kasan/generic.c | 8 +- + mm/kasan/kasan.h | 1 + + mm/kasan/quarantine.c | 2 +- + mm/kasan/report.c | 13 +- + mm/kasan/report_tags.c | 10 +- + mm/kfence/core.c | 17 +- + mm/kfence/kfence_test.c | 6 +- + mm/memcontrol.c | 43 +- + mm/slab.c | 455 ++++++++--------- + mm/slab.h | 328 ++++++++++-- + mm/slab_common.c | 8 +- + mm/slob.c | 46 +- + mm/slub.c | 1164 +++++++++++++++++++++--------------------- + mm/sparse.c | 2 +- + mm/usercopy.c | 13 +- + mm/zsmalloc.c | 18 +- + 27 files changed, 1266 insertions(+), 1038 deletions(-) +Merging random/master (442e8775c9e5 random: document add_hwgenerator_randomness() with other input functions) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/random.git random/master +Merge made by the 'recursive' strategy. + drivers/char/random.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) +Merging akpm-current/current (9bd91a86f234 lib/Kconfig.debug: make TEST_KMOD depend on PAGE_SIZE_LESS_THAN_256KB) +$ git merge --no-ff akpm-current/current +Auto-merging mm/zsmalloc.c +CONFLICT (content): Merge conflict in mm/zsmalloc.c +Auto-merging mm/slub.c +Auto-merging mm/slab_common.c +Auto-merging mm/slab.h +Auto-merging mm/percpu.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging mm/filemap.c +Auto-merging mm/damon/vaddr.c +Auto-merging mm/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/rcu/rcutorture.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kasan.h +Auto-merging include/linux/fs.h +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/inode.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging .mailmap +Resolved 'mm/memcontrol.c' using previous resolution. +Resolved 'mm/zsmalloc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 780ed5340d65] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 2 + + Documentation/admin-guide/cgroup-v1/hugetlb.rst | 4 + + Documentation/admin-guide/cgroup-v2.rst | 5 + + Documentation/admin-guide/kernel-parameters.txt | 2 +- + .../admin-guide/mm/numa_memory_policy.rst | 16 +- + Documentation/admin-guide/sysctl/vm.rst | 2 +- + Documentation/filesystems/proc.rst | 6 +- + Documentation/vm/arch_pgtable_helpers.rst | 6 +- + Documentation/vm/balance.rst | 2 +- + Documentation/vm/index.rst | 1 + + Documentation/vm/page_migration.rst | 12 +- + Documentation/vm/page_table_check.rst | 56 +++ + MAINTAINERS | 11 +- + arch/Kconfig | 14 + + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/alpha/mm/fault.c | 16 +- + arch/arc/mm/fault.c | 3 +- + arch/arm/mm/fault.c | 2 +- + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/uaccess.h | 33 ++ + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/kernel/module.c | 4 +- + arch/arm64/mm/fault.c | 6 +- + arch/hexagon/mm/vm_fault.c | 8 +- + arch/ia64/kernel/module.c | 6 +- + arch/ia64/kernel/setup.c | 5 +- + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/ia64/kernel/uncached.c | 2 +- + arch/ia64/mm/fault.c | 16 +- + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/mm/fault.c | 22 +- + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/mm/fault.c | 22 +- + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/mips/mm/fault.c | 19 +- + arch/nds32/mm/fault.c | 18 +- + arch/nios2/mm/fault.c | 18 +- + arch/openrisc/mm/fault.c | 18 +- + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/parisc/mm/fault.c | 18 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/mm/fault.c | 6 +- + arch/riscv/mm/fault.c | 2 +- + arch/s390/kernel/module.c | 5 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/mm/fault.c | 28 +- + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sh/mm/fault.c | 20 +- + arch/sparc/kernel/led.c | 3 +- + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/mm/fault_32.c | 16 +- + arch/sparc/mm/fault_64.c | 16 +- + arch/um/kernel/trap.c | 8 +- + arch/x86/Kconfig | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/pgtable.h | 29 +- + arch/x86/kernel/module.c | 7 +- + arch/x86/mm/fault.c | 3 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + arch/xtensa/mm/fault.c | 17 +- + drivers/block/zram/zram_drv.c | 11 +- + drivers/dax/bus.c | 32 ++ + drivers/dax/bus.h | 1 + + drivers/dax/device.c | 126 +++-- + drivers/infiniband/hw/qib/qib.h | 2 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/sw/siw/siw_main.c | 7 +- + drivers/iommu/tegra-smmu.c | 4 +- + drivers/of/fdt.c | 6 +- + fs/binfmt_elf.c | 45 +- + fs/btrfs/Kconfig | 3 +- + fs/btrfs/ioctl.c | 3 +- + fs/buffer.c | 56 ++- + fs/exec.c | 5 +- + fs/ext4/extents.c | 8 +- + fs/ext4/inline.c | 5 +- + fs/ext4/page-io.c | 9 +- + fs/f2fs/data.c | 4 +- + fs/f2fs/gc.c | 5 +- + fs/f2fs/inode.c | 4 +- + fs/f2fs/node.c | 4 +- + fs/f2fs/recovery.c | 6 +- + fs/f2fs/segment.c | 9 +- + fs/f2fs/super.c | 5 +- + fs/hfsplus/hfsplus_raw.h | 12 +- + fs/hfsplus/xattr.c | 4 +- + fs/inode.c | 49 ++ + fs/ioctl.c | 2 +- + fs/ocfs2/journal.c | 6 +- + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/proc/array.c | 3 + + fs/proc/fd.c | 23 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 12 +- + fs/proc/vmcore.c | 10 +- + fs/squashfs/super.c | 33 ++ + fs/userfaultfd.c | 7 +- + fs/xfs/kmem.c | 3 +- + fs/xfs/xfs_buf.c | 2 +- + include/linux/ceph/libceph.h | 1 - + include/linux/damon.h | 25 +- + include/linux/delay.h | 14 +- + include/linux/delayacct.h | 79 +-- + include/linux/elfcore-compat.h | 5 + + include/linux/elfcore.h | 5 + + include/linux/fs.h | 1 + + include/linux/gfp.h | 20 +- + include/linux/hugetlb.h | 10 +- + include/linux/hugetlb_cgroup.h | 7 + + include/linux/kasan.h | 4 +- + include/linux/kthread.h | 26 + + include/linux/list.h | 36 +- + include/linux/mempolicy.h | 6 +- + include/linux/memremap.h | 17 + + include/linux/migrate.h | 2 + + include/linux/mm.h | 19 +- + include/linux/mm_types.h | 73 ++- + include/linux/page-flags.h | 96 +++- + include/linux/page_table_check.h | 147 ++++++ + include/linux/pagemap.h | 1 + + include/linux/pgtable.h | 8 + + include/linux/proc_fs.h | 12 +- + include/linux/rmap.h | 8 +- + include/linux/rwlock.h | 6 + + include/linux/rwlock_api_smp.h | 8 + + include/linux/rwlock_rt.h | 10 + + include/linux/sched.h | 17 +- + include/linux/sched/mm.h | 26 + + include/linux/spinlock_api_up.h | 1 + + include/linux/syscalls.h | 3 + + include/linux/uaccess.h | 21 + + include/linux/vmalloc.h | 7 + + include/ras/ras_event.h | 2 - + include/trace/events/compaction.h | 24 +- + include/trace/events/damon.h | 7 +- + include/trace/events/error_report.h | 8 +- + include/trace/events/mmflags.h | 1 - + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/prctl.h | 3 + + include/uapi/linux/resource.h | 13 +- + init/main.c | 25 +- + kernel/configs/debug.config | 105 ++++ + kernel/delayacct.c | 34 +- + kernel/fork.c | 2 + + kernel/hung_task.c | 44 ++ + kernel/kthread.c | 33 +- + kernel/locking/spinlock.c | 10 + + kernel/locking/spinlock_rt.c | 12 + + kernel/panic.c | 2 + + kernel/rcu/rcutorture.c | 7 +- + kernel/sys.c | 63 +++ + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 11 +- + kernel/time/timer.c | 16 +- + kernel/trace/ring_buffer.c | 7 +- + kernel/trace/trace_hwlat.c | 6 +- + kernel/trace/trace_osnoise.c | 3 +- + lib/Kconfig.debug | 7 + + lib/kstrtox.c | 12 + + lib/lz4/lz4_decompress.c | 8 +- + lib/test_hmm.c | 24 + + lib/test_kasan.c | 30 +- + lib/test_printf.c | 8 +- + mm/Kconfig | 14 + + mm/Kconfig.debug | 24 + + mm/Makefile | 1 + + mm/backing-dev.c | 7 + + mm/compaction.c | 7 +- + mm/damon/core.c | 30 +- + mm/damon/dbgfs.c | 11 +- + mm/damon/paddr.c | 11 +- + mm/damon/prmtv-common.h | 4 - + mm/damon/vaddr-test.h | 79 ++- + mm/damon/vaddr.c | 43 +- + mm/debug.c | 52 +- + mm/debug_vm_pgtable.c | 2 +- + mm/filemap.c | 90 +++- + mm/frontswap.c | 4 +- + mm/gup.c | 37 +- + mm/hmm.c | 5 +- + mm/hugetlb.c | 2 +- + mm/hugetlb_cgroup.c | 133 +++++- + mm/hugetlb_vmemmap.c | 68 +-- + mm/internal.h | 7 +- + mm/kasan/shadow.c | 9 +- + mm/khugepaged.c | 14 +- + mm/kmemleak.c | 21 +- + mm/ksm.c | 4 +- + mm/madvise.c | 493 ++++++++++++------- + mm/memcontrol.c | 143 +++--- + mm/memory-failure.c | 187 +++++--- + mm/memory.c | 4 - + mm/memory_hotplug.c | 2 +- + mm/mempolicy.c | 102 +++- + mm/memremap.c | 38 +- + mm/migrate.c | 273 +++++++---- + mm/mlock.c | 2 +- + mm/mmap.c | 54 ++- + mm/mprotect.c | 2 +- + mm/oom_kill.c | 27 +- + mm/page_alloc.c | 187 +++++--- + mm/page_counter.c | 1 - + mm/page_ext.c | 4 + + mm/page_io.c | 3 + + mm/page_table_check.c | 263 ++++++++++ + mm/percpu-internal.h | 18 + + mm/percpu-vm.c | 8 +- + mm/percpu.c | 10 +- + mm/ptdump.c | 16 +- + mm/rmap.c | 57 ++- + mm/shmem.c | 91 +++- + mm/slab.h | 5 - + mm/slab_common.c | 34 +- + mm/slub.c | 15 +- + mm/sparse-vmemmap.c | 70 ++- + mm/swap.c | 2 +- + mm/userfaultfd.c | 5 + + mm/util.c | 15 +- + mm/vmalloc.c | 59 ++- + mm/vmscan.c | 2 +- + mm/zsmalloc.c | 529 ++++++++------------- + net/ceph/buffer.c | 4 +- + net/ceph/ceph_common.c | 27 -- + net/ceph/crypto.c | 2 +- + net/ceph/messenger.c | 2 +- + net/ceph/messenger_v2.c | 2 +- + net/ceph/osdmap.c | 12 +- + net/sunrpc/svc_xprt.c | 3 +- + samples/bpf/offwaketime_kern.c | 4 +- + samples/bpf/test_overhead_kprobe_kern.c | 11 +- + samples/bpf/test_overhead_tp_kern.c | 5 +- + scripts/checkpatch.pl | 54 +-- + scripts/const_structs.checkpatch | 23 + + scripts/spelling.txt | 1 + + tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 4 +- + tools/perf/builtin-kmem.c | 1 - + tools/testing/radix-tree/linux/gfp.h | 3 +- + .../selftests/bpf/progs/test_stacktrace_map.c | 6 +- + .../testing/selftests/bpf/progs/test_tracepoint.c | 6 +- + tools/testing/selftests/damon/.gitignore | 2 + + tools/testing/selftests/damon/Makefile | 7 +- + tools/testing/selftests/damon/_debugfs_common.sh | 52 ++ + tools/testing/selftests/damon/debugfs_attrs.sh | 73 +-- + .../selftests/damon/debugfs_empty_targets.sh | 13 + + .../damon/debugfs_huge_count_read_write.sh | 22 + + tools/testing/selftests/damon/debugfs_schemes.sh | 19 + + .../testing/selftests/damon/debugfs_target_ids.sh | 19 + + .../selftests/damon/huge_count_read_write.c | 39 ++ + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 1 + + tools/testing/selftests/vm/hmm-tests.c | 42 ++ + tools/testing/selftests/vm/hugepage-mremap.c | 46 +- + tools/testing/selftests/vm/hugepage-vmemmap.c | 144 ++++++ + tools/testing/selftests/vm/run_vmtests.sh | 13 +- + tools/testing/selftests/vm/userfaultfd.c | 16 +- + tools/vm/page_owner_sort.c | 46 +- + 265 files changed, 4558 insertions(+), 2025 deletions(-) + create mode 100644 Documentation/vm/page_table_check.rst + create mode 100644 include/linux/page_table_check.h + create mode 100644 kernel/configs/debug.config + create mode 100644 mm/page_table_check.c + create mode 100644 tools/testing/selftests/damon/.gitignore + create mode 100644 tools/testing/selftests/damon/_debugfs_common.sh + create mode 100644 tools/testing/selftests/damon/debugfs_empty_targets.sh + create mode 100644 tools/testing/selftests/damon/debugfs_huge_count_read_write.sh + create mode 100644 tools/testing/selftests/damon/debugfs_schemes.sh + create mode 100644 tools/testing/selftests/damon/debugfs_target_ids.sh + create mode 100644 tools/testing/selftests/damon/huge_count_read_write.c + create mode 100644 tools/testing/selftests/vm/hugepage-vmemmap.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/58)
Rebasing (2/58)
Rebasing (3/58)
Rebasing (4/58)
Rebasing (5/58)
Rebasing (6/58)
Rebasing (7/58)
Rebasing (8/58)
Rebasing (9/58)
Rebasing (10/58)
Rebasing (11/58)
Rebasing (12/58)
Rebasing (13/58)
Rebasing (14/58)
Rebasing (15/58)
Rebasing (16/58)
Rebasing (17/58)
Rebasing (18/58)
Rebasing (19/58)
Rebasing (20/58)
Rebasing (21/58)
Rebasing (22/58)
Rebasing (23/58)
Rebasing (24/58)
Rebasing (25/58)
Rebasing (26/58)
Rebasing (27/58)
Rebasing (28/58)
Rebasing (29/58)
Rebasing (30/58)
Rebasing (31/58)
Rebasing (32/58)
Rebasing (33/58)
Rebasing (34/58)
Rebasing (35/58)
Rebasing (36/58)
Rebasing (37/58)
Rebasing (38/58)
Rebasing (39/58)
Rebasing (40/58)
Rebasing (41/58)
Rebasing (42/58)
Rebasing (43/58)
Rebasing (44/58)
Rebasing (45/58)
Rebasing (46/58)
Rebasing (47/58)
Rebasing (48/58)
Rebasing (49/58)
Rebasing (50/58)
Rebasing (51/58)
Rebasing (52/58)
Rebasing (53/58)
Rebasing (54/58)
Rebasing (55/58)
Rebasing (56/58)
Rebasing (57/58)
Rebasing (58/58)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 93db3a57437b...4a6df865acad akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (4a6df865acad lib/stackdepot: always do filter_irq_stacks() in stack_depot_save()) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/alpha/kernel/srm_env.c | 4 +- + arch/arm/kernel/atags_proc.c | 2 +- + arch/arm/mm/alignment.c | 2 +- + arch/ia64/kernel/salinfo.c | 10 +- + arch/powerpc/kernel/proc_powerpc.c | 4 +- + arch/sh/mm/alignment.c | 4 +- + arch/xtensa/platforms/iss/simdisk.c | 4 +- + drivers/acpi/proc.c | 2 +- + drivers/base/firmware_loader/fallback.c | 7 +- + drivers/base/firmware_loader/fallback.h | 11 + + drivers/base/firmware_loader/fallback_table.c | 25 +- + drivers/cdrom/cdrom.c | 23 +- + drivers/char/hpet.c | 22 +- + drivers/char/random.c | 14 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 1 + + drivers/gpu/drm/drm_mm.c | 4 + + drivers/gpu/drm/drm_modeset_lock.c | 9 + + drivers/gpu/drm/i915/i915_perf.c | 22 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 + + drivers/hwmon/dell-smm-hwmon.c | 4 +- + drivers/macintosh/mac_hid.c | 24 +- + drivers/net/bonding/bond_procfs.c | 8 +- + drivers/net/wireless/cisco/airo.c | 22 +- + drivers/net/wireless/intersil/hostap/hostap_ap.c | 16 +- + .../net/wireless/intersil/hostap/hostap_download.c | 2 +- + drivers/net/wireless/intersil/hostap/hostap_proc.c | 24 +- + drivers/net/wireless/ray_cs.c | 2 +- + drivers/nubus/proc.c | 36 +- + drivers/parisc/led.c | 4 +- + drivers/pci/proc.c | 10 +- + drivers/platform/x86/thinkpad_acpi.c | 4 +- + drivers/platform/x86/toshiba_acpi.c | 16 +- + drivers/pnp/isapnp/proc.c | 2 +- + drivers/pnp/pnpbios/proc.c | 4 +- + drivers/scsi/scsi_proc.c | 4 +- + drivers/scsi/sg.c | 35 +- + drivers/usb/gadget/function/rndis.c | 4 +- + drivers/zorro/proc.c | 2 +- + fs/Makefile | 2 + + fs/afs/proc.c | 6 +- + fs/aio.c | 31 +- + fs/binfmt_misc.c | 6 +- + fs/coredump.c | 66 +- + fs/dcache.c | 37 +- + fs/eventpoll.c | 10 +- + fs/exec.c | 35 + + fs/ext4/mballoc.c | 14 +- + fs/file_table.c | 47 +- + fs/inode.c | 39 +- + fs/jbd2/journal.c | 2 +- + fs/locks.c | 34 +- + fs/namei.c | 58 +- + fs/namespace.c | 24 +- + fs/notify/dnotify/dnotify.c | 21 +- + fs/notify/fanotify/fanotify_user.c | 10 +- + fs/notify/inotify/inotify_user.c | 11 +- + fs/ocfs2/stackglue.c | 25 +- + fs/pipe.c | 64 +- + fs/proc/generic.c | 6 - + fs/proc/inode.c | 1 + + fs/proc/internal.h | 5 - + fs/proc/proc_net.c | 8 +- + fs/proc/proc_sysctl.c | 63 +- + fs/sysctls.c | 39 ++ + include/linux/aio.h | 4 - + include/linux/coredump.h | 10 +- + include/linux/dcache.h | 10 - + include/linux/dnotify.h | 1 - + include/linux/fanotify.h | 2 - + include/linux/fs.h | 13 - + include/linux/inotify.h | 3 - + include/linux/kprobes.h | 6 - + include/linux/mount.h | 3 - + include/linux/pipe_fs_i.h | 4 - + include/linux/poll.h | 2 - + include/linux/printk.h | 4 - + include/linux/proc_fs.h | 13 +- + include/linux/sched/sysctl.h | 14 +- + include/linux/seq_file.h | 2 +- + include/linux/stackdepot.h | 25 +- + include/linux/stackleak.h | 5 - + include/linux/sysctl.h | 67 +- + include/scsi/sg.h | 4 - + init/main.c | 9 +- + ipc/util.c | 2 +- + kernel/hung_task.c | 81 ++- + kernel/irq/proc.c | 8 +- + kernel/kprobes.c | 30 +- + kernel/printk/Makefile | 5 +- + kernel/printk/internal.h | 8 + + kernel/printk/printk.c | 4 +- + kernel/printk/sysctl.c | 85 +++ + kernel/resource.c | 4 +- + kernel/stackleak.c | 26 +- + kernel/sysctl.c | 716 ++------------------- + kernel/watchdog.c | 101 +++ + lib/Kconfig | 4 + + lib/Kconfig.kasan | 2 +- + lib/stackdepot.c | 46 +- + lib/test_sysctl.c | 22 +- + mm/kasan/common.c | 1 - + mm/page_owner.c | 2 + + net/atm/proc.c | 4 +- + net/bluetooth/af_bluetooth.c | 8 +- + net/can/bcm.c | 2 +- + net/can/proc.c | 2 +- + net/core/neighbour.c | 6 +- + net/core/pktgen.c | 6 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 6 +- + net/ipv4/raw.c | 8 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/udp.c | 6 +- + net/netfilter/x_tables.c | 10 +- + net/netfilter/xt_hashlimit.c | 18 +- + net/netfilter/xt_recent.c | 4 +- + net/sunrpc/auth_gss/svcauth_gss.c | 4 +- + net/sunrpc/cache.c | 24 +- + net/sunrpc/stats.c | 2 +- + sound/core/info.c | 4 +- + 119 files changed, 1364 insertions(+), 1160 deletions(-) + create mode 100644 fs/sysctls.c + create mode 100644 kernel/printk/sysctl.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..697983b3d74f --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20211206 |