linux-kernel - linux-next: manual merge of the driver-core tree with the jc

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 for Android: free password hash cracker in your pocket

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

Message-ID: <aXfkoKZ01qTrAlDJ@sirena.org.uk>
Date: Mon, 26 Jan 2026 22:03:12 +0000
From: Mark Brown <broonie@...nel.org>
To: Greg KH <greg@...ah.com>, Danilo Krummrich <dakr@...nel.org>,
	"Rafael J. Wysocki" <rafael@...nel.org>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Jani Nikula <jani.nikula@...el.com>,
	Jonathan Corbet <corbet@....net>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Tzung-Bi Shih <tzungbi@...nel.org>
Subject: linux-next: manual merge of the driver-core tree with the jc_docs
 tree

Hi all,

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

  Documentation/driver-api/driver-model/index.rst

between commit:

  a592a36e49372 ("Documentation: use a source-read extension for the index link boilerplate")

from the jc_docs tree and commit:

  62eb557580eb2 ("revocable: Revocable resource management")

from the driver-core 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.

diff --cc Documentation/driver-api/driver-model/index.rst
index abeb4b36636b6,8e1ee21185dfb..0000000000000
--- a/Documentation/driver-api/driver-model/index.rst
+++ b/Documentation/driver-api/driver-model/index.rst
@@@ -14,3 -14,11 +14,4 @@@ Driver Mode
     overview
     platform
     porting
+    revocable
 -
 -.. only::  subproject and html
 -
 -   Indices
 -   =======
 -
 -   * :ref:`genindex`

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)