linux-kernel - linux-next: manual merge of the jc_docs tree with the usb.current 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: <20240131095231.292911c3@canb.auug.org.au>
Date: Wed, 31 Jan 2024 09:52:31 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jonathan Corbet <corbet@....net>, Greg Kroah-Hartman
 <gregkh@...uxfoundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Randy Dunlap
 <rdunlap@...radead.org>, Udipto Goswami <quic_ugoswami@...cinc.com>
Subject: linux-next: manual merge of the jc_docs tree with the usb.current
 tree

Hi all,

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

  Documentation/usb/gadget-testing.rst

between commit:

  20d03ae36ec0 ("usb: gadget: ncm: Fix indentations in documentation of NCM section")

from the usb.current tree and commit:

  e49bf650ab5b ("usb: gadget: fix max_segment_size malformed table")

from the jc_docs tree.

I fixed it up (these commits fix the same problem, I used the former) 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

Content of type "application/pgp-signature" skipped