linux-kernel - Re: linux-next: manual merge of the v4l-dvb 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20250128114901.17b5b765@canb.auug.org.au>
Date: Tue, 28 Jan 2025 11:49:01 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jonathan Corbet <corbet@....net>
Cc: Mauro Carvalho Chehab <mchehab@...nel.org>, Bagas Sanjaya
 <bagasdotme@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Mauro Carvalho Chehab
 <mchehab+huawei@...nel.org>, Sakari Ailus <sakari.ailus@...ux.intel.com>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with the jc_docs
 tree

Hi all,

On Thu, 23 Jan 2025 12:07:28 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
> 
>   Documentation/admin-guide/media/ipu3.rst
> 
> between commit:
> 
>   3961fba7e1e9 ("media: ipu3.rst: Prune unreferenced footnotes")
> 
> from the jc_docs tree and commit:
> 
>   688c0a6907a7 ("media: Documentation: ipu3: Remove unused and obsolete references")
> 
> from the v4l-dvb tree.
> 
> I fixed it up (I just used the former - it added one more line) 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.

This is now a conflict between the jc_docs tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped