mbox series

[v3,0/8] docs: consolidate sysfs-block into Documentation/ABI/

Message ID 20211209003833.6396-1-ebiggers@kernel.org (mailing list archive)
Headers show
Series docs: consolidate sysfs-block into Documentation/ABI/ | expand

Message

Eric Biggers Dec. 9, 2021, 12:38 a.m. UTC
This series consolidates the documentation for /sys/block/<disk>/queue/
into Documentation/ABI/, where it is supposed to go (as per Greg KH:
https://lore.kernel.org/r/YaXXpEAwVGTLjp1e@kroah.com).

This series also updates MAINTAINERS to associate the block
documentation with the block layer.

This series applies to linux-block/for-next.

Changed v2 => v3:
   - Improved documentation for stable_writes and virt_boundary_mask.
   - Added more Reviewed-by tags.

Changed v1 => v2:
   - Added patch which moves the documentation to the stable directory.
   - Added Reviewed-by tags.

Eric Biggers (8):
  docs: sysfs-block: move to stable directory
  docs: sysfs-block: sort alphabetically
  docs: sysfs-block: add contact for nomerges
  docs: sysfs-block: fill in missing documentation from queue-sysfs.rst
  docs: sysfs-block: document stable_writes
  docs: sysfs-block: document virt_boundary_mask
  docs: block: remove queue-sysfs.rst
  MAINTAINERS: add entries for block layer documentation

 Documentation/ABI/stable/sysfs-block  | 676 ++++++++++++++++++++++++++
 Documentation/ABI/testing/sysfs-block | 346 -------------
 Documentation/block/index.rst         |   1 -
 Documentation/block/queue-sysfs.rst   | 321 ------------
 MAINTAINERS                           |   2 +
 5 files changed, 678 insertions(+), 668 deletions(-)
 create mode 100644 Documentation/ABI/stable/sysfs-block
 delete mode 100644 Documentation/ABI/testing/sysfs-block
 delete mode 100644 Documentation/block/queue-sysfs.rst

base-commit: 2a7f2f5e3f0a18344b1a5d4ffa9307ffc9cbeee2

Comments

Eric Biggers Dec. 21, 2021, 3:41 p.m. UTC | #1
On Wed, Dec 08, 2021 at 04:38:25PM -0800, Eric Biggers wrote:
> This series consolidates the documentation for /sys/block/<disk>/queue/
> into Documentation/ABI/, where it is supposed to go (as per Greg KH:
> https://lore.kernel.org/r/YaXXpEAwVGTLjp1e@kroah.com).
> 
> This series also updates MAINTAINERS to associate the block
> documentation with the block layer.
> 
> This series applies to linux-block/for-next.
> 
> Changed v2 => v3:
>    - Improved documentation for stable_writes and virt_boundary_mask.
>    - Added more Reviewed-by tags.
> 
> Changed v1 => v2:
>    - Added patch which moves the documentation to the stable directory.
>    - Added Reviewed-by tags.

Jens, any interest in applying this series?

- Eric
Eric Biggers Jan. 3, 2022, 3:06 p.m. UTC | #2
On Tue, Dec 21, 2021 at 09:41:47AM -0600, Eric Biggers wrote:
> On Wed, Dec 08, 2021 at 04:38:25PM -0800, Eric Biggers wrote:
> > This series consolidates the documentation for /sys/block/<disk>/queue/
> > into Documentation/ABI/, where it is supposed to go (as per Greg KH:
> > https://lore.kernel.org/r/YaXXpEAwVGTLjp1e@kroah.com).
> > 
> > This series also updates MAINTAINERS to associate the block
> > documentation with the block layer.
> > 
> > This series applies to linux-block/for-next.
> > 
> > Changed v2 => v3:
> >    - Improved documentation for stable_writes and virt_boundary_mask.
> >    - Added more Reviewed-by tags.
> > 
> > Changed v1 => v2:
> >    - Added patch which moves the documentation to the stable directory.
> >    - Added Reviewed-by tags.
> 
> Jens, any interest in applying this series?
> 
> - Eric

Ping.
Eric Biggers Jan. 6, 2022, 9:41 p.m. UTC | #3
On Mon, Jan 03, 2022 at 09:06:18AM -0600, Eric Biggers wrote:
> On Tue, Dec 21, 2021 at 09:41:47AM -0600, Eric Biggers wrote:
> > On Wed, Dec 08, 2021 at 04:38:25PM -0800, Eric Biggers wrote:
> > > This series consolidates the documentation for /sys/block/<disk>/queue/
> > > into Documentation/ABI/, where it is supposed to go (as per Greg KH:
> > > https://lore.kernel.org/r/YaXXpEAwVGTLjp1e@kroah.com).
> > > 
> > > This series also updates MAINTAINERS to associate the block
> > > documentation with the block layer.
> > > 
> > > This series applies to linux-block/for-next.
> > > 
> > > Changed v2 => v3:
> > >    - Improved documentation for stable_writes and virt_boundary_mask.
> > >    - Added more Reviewed-by tags.
> > > 
> > > Changed v1 => v2:
> > >    - Added patch which moves the documentation to the stable directory.
> > >    - Added Reviewed-by tags.
> > 
> > Jens, any interest in applying this series?
> > 
> > - Eric
> 
> Ping.

Jens, any reason you haven't applied this series yet?  It looks like you've been
applying other patches.  To be clear, I've been expecting that this would go in
through the block tree, rather than the docs tree.

- Eric
Bart Van Assche Jan. 7, 2022, 8:58 p.m. UTC | #4
On 1/6/22 13:41, Eric Biggers wrote:
> Jens, any reason you haven't applied this series yet?  It looks like you've been
> applying other patches.  To be clear, I've been expecting that this would go in
> through the block tree, rather than the docs tree.

We are close to the v5.17 merge window so this is not a good time for a maintainer to
apply a large patch series. If Jens does not reply I propose to repost this patch
series after the v5.17 merge window has closed (three weeks from now?).

See also https://lore.kernel.org/lkml/CAHk-=wg=3dEpPGhz8YvJUDWhFW_GUeASBGmqyw3aPQRfB3ki9w@mail.gmail.com/

Thanks,

Bart.
Jens Axboe Jan. 9, 2022, 5:01 p.m. UTC | #5
On 1/7/22 1:58 PM, Bart Van Assche wrote:
> On 1/6/22 13:41, Eric Biggers wrote:
>> Jens, any reason you haven't applied this series yet?  It looks like you've been
>> applying other patches.  To be clear, I've been expecting that this would go in
>> through the block tree, rather than the docs tree.
> 
> We are close to the v5.17 merge window so this is not a good time for a maintainer to
> apply a large patch series. If Jens does not reply I propose to repost this patch
> series after the v5.17 merge window has closed (three weeks from now?).

I'm fine with it, but it should probably just go through the doc tree.
Eric Biggers Jan. 9, 2022, 9:25 p.m. UTC | #6
On Sun, Jan 09, 2022 at 10:01:11AM -0700, Jens Axboe wrote:
> On 1/7/22 1:58 PM, Bart Van Assche wrote:
> > On 1/6/22 13:41, Eric Biggers wrote:
> >> Jens, any reason you haven't applied this series yet?  It looks like you've been
> >> applying other patches.  To be clear, I've been expecting that this would go in
> >> through the block tree, rather than the docs tree.
> > 
> > We are close to the v5.17 merge window so this is not a good time for a maintainer to
> > apply a large patch series. If Jens does not reply I propose to repost this patch
> > series after the v5.17 merge window has closed (three weeks from now?).
> 
> I'm fine with it, but it should probably just go through the doc tree.

I think it makes much more sense for subsystems to be responsible for their own
documentation; that's why patch 8 in this series adds the block layer
documentation to the block layer MAINTAINERS entry.  Do you disagree with that?

- Eric
Jens Axboe Jan. 10, 2022, 1:58 a.m. UTC | #7
On 1/9/22 2:25 PM, Eric Biggers wrote:
> On Sun, Jan 09, 2022 at 10:01:11AM -0700, Jens Axboe wrote:
>> On 1/7/22 1:58 PM, Bart Van Assche wrote:
>>> On 1/6/22 13:41, Eric Biggers wrote:
>>>> Jens, any reason you haven't applied this series yet?  It looks like you've been
>>>> applying other patches.  To be clear, I've been expecting that this would go in
>>>> through the block tree, rather than the docs tree.
>>>
>>> We are close to the v5.17 merge window so this is not a good time for a maintainer to
>>> apply a large patch series. If Jens does not reply I propose to repost this patch
>>> series after the v5.17 merge window has closed (three weeks from now?).
>>
>> I'm fine with it, but it should probably just go through the doc tree.
> 
> I think it makes much more sense for subsystems to be responsible for
> their own documentation; that's why patch 8 in this series adds the
> block layer documentation to the block layer MAINTAINERS entry.  Do
> you disagree with that?

I agree, but then we often end up with merge conflicts between the doc
tree and others. That's why it's usually punted there. As a maintainer,
any conflicts is a pain in the butt to deal with, something the
contributor doesn't necessarily see or understand.

If there are no conflicts this time around, I can queue them up.
Jens Axboe Jan. 10, 2022, 1:59 a.m. UTC | #8
On Wed, 8 Dec 2021 16:38:25 -0800, Eric Biggers wrote:
> This series consolidates the documentation for /sys/block/<disk>/queue/
> into Documentation/ABI/, where it is supposed to go (as per Greg KH:
> https://lore.kernel.org/r/YaXXpEAwVGTLjp1e@kroah.com).
> 
> This series also updates MAINTAINERS to associate the block
> documentation with the block layer.
> 
> [...]

Applied, thanks!

[1/8] docs: sysfs-block: move to stable directory
      commit: ae7a7a53498f452eb927cd4b4eed0bccded85ebf
[2/8] docs: sysfs-block: sort alphabetically
      commit: 07c9093c429361dd405499b1e433e4170b81551f
[3/8] docs: sysfs-block: add contact for nomerges
      commit: 8b0551a74b4a9396a7f6ddb0c5f6f3c8465e9d45
[4/8] docs: sysfs-block: fill in missing documentation from queue-sysfs.rst
      commit: 849ab826e10531f106846e8e9eeae8d00a198f6e
[5/8] docs: sysfs-block: document stable_writes
      commit: 1163010418a7f0c60c309743498cb6c5cd828ecc
[6/8] docs: sysfs-block: document virt_boundary_mask
      commit: 8bc2f7c67061cb39e317a45ad9870f529b1fb190
[7/8] docs: block: remove queue-sysfs.rst
      commit: 208e4f9c0028e9181220460600b1df0bc677e796
[8/8] MAINTAINERS: add entries for block layer documentation
      commit: f029cedb9bb5bab7f1bb3042be348f2dac0ee66e

Best regards,
Jonathan Corbet Jan. 11, 2022, 12:37 a.m. UTC | #9
Jens Axboe <axboe@kernel.dk> writes:

> On 1/9/22 2:25 PM, Eric Biggers wrote:
>> I think it makes much more sense for subsystems to be responsible for
>> their own documentation; that's why patch 8 in this series adds the
>> block layer documentation to the block layer MAINTAINERS entry.  Do
>> you disagree with that?
>
> I agree, but then we often end up with merge conflicts between the doc
> tree and others. That's why it's usually punted there. As a maintainer,
> any conflicts is a pain in the butt to deal with, something the
> contributor doesn't necessarily see or understand.
>
> If there are no conflicts this time around, I can queue them up.

[Docs maintainer not copied on any of this, but you can't escape :)]

Maintaining docs is a bit of a challenge for the reason Jens mentions:
everybody puts their fingers into it, and the result is lots of merge
conflicts.  For that reason, I'd prefer that big changes go through the
docs tree.  Changes to directories like Documentation/ABI can be
especially prone to conflicts, FWIW.

I also tend to be a bit more attentive to things like the addition of
docs-build warnings than maintainers from other subsystems.

That said, the real goal is to get more and better documentation merged,
and it often does make the most sense for docs changes to go through
other trees.  Forcing the separation of documentation changes from the
code changes they reflect would be kind of silly at best, for example.
So if the block tree is the best path for these changes, then all I can
say is:

  Acked-by: Jonathan Corbet <corbet@lwn.net>

Thanks,

jon