From: Sakari Ailus <sakari.ailus@linux•intel.com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Mauro Carvalho Chehab <mchehab@kernel•org>,
Jason Cooper <jason@lakedaemon•net>, Andrew Lunn <andrew@lunn•ch>,
Gregory Clement <gregory.clement@bootlin•com>,
ARM <linux-arm-kernel@lists•infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Luka Kovacic <luka.kovacic@sartura•hr>,
Mauro Carvalho Chehab <mchehab+huawei@kernel•org>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with the mvebu tree
Date: Fri, 4 Dec 2020 13:39:03 +0200 [thread overview]
Message-ID: <20201204113903.GS852@paasikivi.fi.intel.com> (raw)
In-Reply-To: <20201203115137.6620f27a@canb.auug.org.au>
On Thu, Dec 03, 2020 at 11:51:37AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 8c4e256e3d42 ("MAINTAINERS: Add an entry for MikroTik CRS3xx 98DX3236 boards")
>
> from the mvebu tree and commit:
>
> b24cc2a18c50 ("media: smiapp: Rename as "ccs"")
>
> from the v4l-dvb 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.
Thanks, Stephen.
The resolution below seems good to me.
--
Sakari Ailus
prev parent reply other threads:[~2020-12-04 11:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 0:51 linux-next: manual merge of the v4l-dvb tree with the mvebu tree Stephen Rothwell
2020-12-04 11:39 ` Sakari Ailus [this message]
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=20201204113903.GS852@paasikivi.fi.intel.com \
--to=sakari.ailus@linux$(echo .)intel.com \
--cc=andrew@lunn$(echo .)ch \
--cc=gregory.clement@bootlin$(echo .)com \
--cc=jason@lakedaemon$(echo .)net \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luka.kovacic@sartura$(echo .)hr \
--cc=mchehab+huawei@kernel$(echo .)org \
--cc=mchehab@kernel$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/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