From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Corbet <corbet@lwn•net>
Cc: Mauro Carvalho Chehab <mchehab@kernel•org>,
Bagas Sanjaya <bagasdotme@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mauro Carvalho Chehab <mchehab+huawei@kernel•org>,
Sakari Ailus <sakari.ailus@linux•intel.com>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with the jc_docs tree
Date: Tue, 28 Jan 2025 11:49:01 +1100 [thread overview]
Message-ID: <20250128114901.17b5b765@canb.auug.org.au> (raw)
In-Reply-To: <20250123120728.5fb6e1b4@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1003 bytes --]
Hi all,
On Thu, 23 Jan 2025 12:07:28 +1100 Stephen Rothwell <sfr@canb•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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-01-28 0:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-23 1:07 linux-next: manual merge of the v4l-dvb tree with the jc_docs tree Stephen Rothwell
2025-01-28 0:49 ` Stephen Rothwell [this message]
2025-01-28 22:03 ` Jonathan Corbet
-- strict thread matches above, loose matches on Subject: below --
2016-12-01 23:31 Stephen Rothwell
2016-12-01 23:55 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250128114901.17b5b765@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bagasdotme@gmail$(echo .)com \
--cc=corbet@lwn$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab+huawei@kernel$(echo .)org \
--cc=mchehab@kernel$(echo .)org \
--cc=sakari.ailus@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox