From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 28 Jul 2023 16:33:14 +0000 (-0700)
Subject: Merge branch 'ynl-couple-of-unrelated-fixes'
X-Git-Tag: block-6.6-2023-09-08~22^2~304
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=083476a2023ce64991e17565707e205a1bf78d63;p=linux-2.6-block.git

Merge branch 'ynl-couple-of-unrelated-fixes'

Stanislav Fomichev says:

====================
ynl: couple of unrelated fixes

- spelling of xdp-features
- s/xdp_zc_max_segs/xdp-zc-max-segs/
- expose xdp-zc-max-segs
- add /* private: */
- regenerate headers
- print xdp_zc_max_segs from sample
====================

Link: https://lore.kernel.org/r/20230727163001.3952878-1-sdf@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

083476a2023ce64991e17565707e205a1bf78d63