linux-kernel - linux-next: manual merge of the rdma tree with the v4l-dvb-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190716104614.2ec8b57c@canb.auug.org.au>
Date:   Tue, 16 Jul 2019 10:46:14 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Doug Ledford <dledford@...hat.com>,
        Jason Gunthorpe <jgg@...lanox.com>,
        Mauro Carvalho Chehab <mchehab@...nel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: manual merge of the rdma tree with the v4l-dvb-next
 tree

Hi all,

Today's linux-next merge of the rdma tree got a conflict in:

  Documentation/index.rst

between commit:

  09fdc957ad0d ("docs: leds: add it to the driver-api book")
(and others following)

from the v4l-dvb-next tree and commit:

  a3a400da206b ("docs: infiniband: add it to the driver-api bookset")

from the rdma tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/index.rst
index f379e43fcda0,869616b57aa8..000000000000
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -96,23 -90,9 +96,24 @@@ needed)
  
     driver-api/index
     core-api/index
 +   locking/index
 +   accounting/index
 +   block/index
 +   cdrom/index
 +   ide/index
 +   fb/index
 +   fpga/index
 +   hid/index
 +   iio/index
 +   leds/index
+    infiniband/index
     media/index
 +   netlabel/index
     networking/index
 +   pcmcia/index
 +   target/index
 +   timers/index
 +   watchdog/index
     input/index
     hwmon/index
     gpu/index

Content of type "application/pgp-signature" skipped