From: Wolfram Sang <wsa@the-dreams.de>
To: Romain Gantois <romain.gantois@bootlin.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>,
Jai Luthra <jai.luthra@ideasonboard.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with the i2c tree
Date: Sat, 31 May 2025 14:05:03 +0200 [thread overview]
Message-ID: <aDrwb1YvwFKQB8x1@shikoro> (raw)
In-Reply-To: <3352024.aeNJFYEL58@fw-rgant>
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
> Below is the resolution I came up with.
Linus solved it differently [1]. I think he is right, but those
interested please double check.
[1] https://lore.kernel.org/all/CAHk-=wiKW=BPcDvBAsVDemdWBR0uh09A_WMOCoceqj3w3doGJg@mail.gmail.com/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2025-05-31 12:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-28 0:49 linux-next: manual merge of the v4l-dvb tree with the i2c tree Stephen Rothwell
2025-04-28 1:22 ` Stephen Rothwell
2025-04-28 1:30 ` Stephen Rothwell
2025-04-29 11:46 ` Tomi Valkeinen
2025-05-29 2:49 ` Stephen Rothwell
2025-05-30 8:13 ` Romain Gantois
2025-05-30 11:24 ` Wolfram Sang
2025-06-02 16:17 ` Romain Gantois
2025-05-31 12:05 ` Wolfram Sang [this message]
2025-06-02 15:57 ` Romain Gantois
-- strict thread matches above, loose matches on Subject: below --
2013-04-03 1:12 Stephen Rothwell
2013-05-01 3:27 ` Stephen Rothwell
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=aDrwb1YvwFKQB8x1@shikoro \
--to=wsa@the-dreams.de \
--cc=hverkuil@xs4all.nl \
--cc=jai.luthra@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=romain.gantois@bootlin.com \
--cc=sakari.ailus@linux.intel.com \
--cc=sfr@canb.auug.org.au \
--cc=tomi.valkeinen@ideasonboard.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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