| Message ID | 12743088687a9b0b305c05b62a5093056a4190b8.1561724493.git.mchehab+samsung@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | None | expand |
On Fri, Jun 28, 2019 at 09:30:28AM -0300, Mauro Carvalho Chehab wrote: > While this contains some uAPI stuff, it was intended to be > read by a kernel doc. So, let's not move it to a different > dir, but, instead, just add it to the driver-api bookset. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > Documentation/index.rst | 1 + > Documentation/infiniband/index.rst | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Documentation/index.rst b/Documentation/index.rst > index ea33cbbccd9d..e69d2fde7735 100644 > +++ b/Documentation/index.rst > @@ -96,6 +96,7 @@ needed). > block/index > hid/index > iio/index > + infiniband/index > leds/index > media/index > networking/index > diff --git a/Documentation/infiniband/index.rst b/Documentation/infiniband/index.rst > index 22eea64de722..9cd7615438b9 100644 > +++ b/Documentation/infiniband/index.rst > @@ -1,4 +1,4 @@ > -:orphan: > +.. SPDX-License-Identifier: GPL-2.0 > > ========== > InfiniBand Should this one go to the rdma.git as well? It looks like yes Thanks, Jason
Em Wed, 3 Jul 2019 15:08:02 -0300 Jason Gunthorpe <jgg@ziepe.ca> escreveu: > On Fri, Jun 28, 2019 at 09:30:28AM -0300, Mauro Carvalho Chehab wrote: > > While this contains some uAPI stuff, it was intended to be > > read by a kernel doc. So, let's not move it to a different > > dir, but, instead, just add it to the driver-api bookset. > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > > Documentation/index.rst | 1 + > > Documentation/infiniband/index.rst | 2 +- > > 2 files changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/index.rst b/Documentation/index.rst > > index ea33cbbccd9d..e69d2fde7735 100644 > > +++ b/Documentation/index.rst > > @@ -96,6 +96,7 @@ needed). > > block/index > > hid/index > > iio/index > > + infiniband/index > > leds/index > > media/index > > networking/index > > diff --git a/Documentation/infiniband/index.rst b/Documentation/infiniband/index.rst > > index 22eea64de722..9cd7615438b9 100644 > > +++ b/Documentation/infiniband/index.rst > > @@ -1,4 +1,4 @@ > > -:orphan: > > +.. SPDX-License-Identifier: GPL-2.0 > > > > ========== > > InfiniBand > > Should this one go to the rdma.git as well? It looks like yes I'm OK if you want to add to rdma.git. However, this will likely rise conflicts, though, as this series has lots of other patches touching Documentation/index.rst. So, I suspect that it would be easier to merge this together with the other patches via the docs tree, by the end of the merge window. If you prefer to apply it against your tree, my plan is to do a final rebase at the second week of the merge window, in order to avoid such conflicts. Thanks, Mauro
On Sat, Jul 06, 2019 at 08:19:50AM -0300, Mauro Carvalho Chehab wrote: > Em Wed, 3 Jul 2019 15:08:02 -0300 > Jason Gunthorpe <jgg@ziepe.ca> escreveu: > > > On Fri, Jun 28, 2019 at 09:30:28AM -0300, Mauro Carvalho Chehab wrote: > > > While this contains some uAPI stuff, it was intended to be > > > read by a kernel doc. So, let's not move it to a different > > > dir, but, instead, just add it to the driver-api bookset. > > > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > > > Documentation/index.rst | 1 + > > > Documentation/infiniband/index.rst | 2 +- > > > 2 files changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/Documentation/index.rst b/Documentation/index.rst > > > index ea33cbbccd9d..e69d2fde7735 100644 > > > +++ b/Documentation/index.rst > > > @@ -96,6 +96,7 @@ needed). > > > block/index > > > hid/index > > > iio/index > > > + infiniband/index > > > leds/index > > > media/index > > > networking/index > > > diff --git a/Documentation/infiniband/index.rst b/Documentation/infiniband/index.rst > > > index 22eea64de722..9cd7615438b9 100644 > > > +++ b/Documentation/infiniband/index.rst > > > @@ -1,4 +1,4 @@ > > > -:orphan: > > > +.. SPDX-License-Identifier: GPL-2.0 > > > > > > ========== > > > InfiniBand > > > > Should this one go to the rdma.git as well? It looks like yes > > I'm OK if you want to add to rdma.git. However, this will likely rise > conflicts, though, as this series has lots of other patches touching > Documentation/index.rst. Applied now, it seems better to keep everything consistent Jason
diff --git a/Documentation/index.rst b/Documentation/index.rst index ea33cbbccd9d..e69d2fde7735 100644 --- a/Documentation/index.rst +++ b/Documentation/index.rst @@ -96,6 +96,7 @@ needed). block/index hid/index iio/index + infiniband/index leds/index media/index networking/index diff --git a/Documentation/infiniband/index.rst b/Documentation/infiniband/index.rst index 22eea64de722..9cd7615438b9 100644 --- a/Documentation/infiniband/index.rst +++ b/Documentation/infiniband/index.rst @@ -1,4 +1,4 @@ -:orphan: +.. SPDX-License-Identifier: GPL-2.0 ========== InfiniBand
While this contains some uAPI stuff, it was intended to be read by a kernel doc. So, let's not move it to a different dir, but, instead, just add it to the driver-api bookset. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> --- Documentation/index.rst | 1 + Documentation/infiniband/index.rst | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)