From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Christian Gromm <christian.gromm@microchip.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Parthiban Veerasooran <Parthiban.Veerasooran@microchip.com>
Subject: Re: linux-next: manual merge of the staging tree with the v4l-dvb tree
Date: Mon, 13 Feb 2023 08:05:18 +0100 [thread overview]
Message-ID: <Y+nhLqlblKqae87H@kroah.com> (raw)
In-Reply-To: <20230213131318.2fdaf4fa@canb.auug.org.au>
On Mon, Feb 13, 2023 at 01:13:18PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> ba47652ba655 ("media: meye: remove this deprecated driver")
>
> from the v4l-dvb tree and commit:
>
> eec8ccab1b57 ("most: add maintainer entry")
>
> from the staging 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.
Fix up looks good, thanks!
greg k-h
next prev parent reply other threads:[~2023-02-13 7:05 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 2:13 linux-next: manual merge of the staging tree with the v4l-dvb tree Stephen Rothwell
2023-02-13 7:05 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-16 3:18 Stephen Rothwell
2024-10-16 5:48 ` Greg KH
2020-03-23 4:18 Stephen Rothwell
2020-03-23 9:56 ` Greg KH
2020-03-19 3:44 Stephen Rothwell
2020-03-19 8:30 ` Greg KH
2019-04-26 6:06 Stephen Rothwell
2019-04-27 6:36 ` Greg KH
2019-05-08 1:54 ` Stephen Rothwell
2019-04-04 2:43 Stephen Rothwell
2018-12-10 5:53 Stephen Rothwell
2018-10-08 4:53 Stephen Rothwell
2018-10-08 4:47 Stephen Rothwell
2018-05-17 4:17 Stephen Rothwell
2018-05-17 7:22 ` Greg KH
2018-05-17 10:06 ` Mauro Carvalho Chehab
2018-05-26 4:45 ` Stephen Rothwell
2017-11-02 4:30 Stephen Rothwell
2017-04-11 3:32 Stephen Rothwell
2017-04-06 3:34 Stephen Rothwell
2017-04-06 18:58 ` Sean Young
2017-04-06 19:19 ` Greg KH
2017-04-06 20:39 ` Sean Young
2017-04-06 21:51 ` Stephen Rothwell
2017-02-06 4:31 Stephen Rothwell
2017-02-06 8:37 ` Greg KH
2016-03-04 5:24 Stephen Rothwell
2016-03-04 16:58 ` Greg KH
2015-05-11 5:28 Stephen Rothwell
2015-05-11 18:34 ` Greg KH
2015-03-24 5:29 Stephen Rothwell
2014-11-24 8:10 Stephen Rothwell
2014-11-24 8:09 Stephen Rothwell
2014-11-05 4:37 Stephen Rothwell
2014-11-05 4:31 Stephen Rothwell
2014-11-05 4:29 Stephen Rothwell
2014-11-06 2:19 ` Greg KH
2014-07-16 6:46 Stephen Rothwell
2014-07-16 20:52 ` Greg KH
2014-03-18 6:15 Stephen Rothwell
2014-03-17 7:55 Stephen Rothwell
2014-03-17 11:01 ` Mauro Carvalho Chehab
2014-03-17 18:29 ` Greg KH
[not found] ` < 20140317162937.2ccdec83@infradead.org>
2014-03-17 19:29 ` Mauro Carvalho Chehab
2014-03-17 22:27 ` Russell King
2014-03-19 15:30 ` Greg KH
2014-03-21 12:24 ` Grant Likely
2014-03-21 14:37 ` Grant Likely
2011-09-27 6:10 Stephen Rothwell
2011-09-27 14:18 ` Greg KH
2011-09-27 20:14 ` Paul Gortmaker
2011-09-27 20:14 ` Paul Gortmaker
2011-07-16 13:03 Stephen Rothwell
2011-07-17 9:15 ` Greg KH
2011-03-04 5:39 Stephen Rothwell
2011-03-04 17:14 ` Greg KH
2011-03-04 5:39 Stephen Rothwell
2011-03-04 17:14 ` Greg KH
2011-03-04 5:39 Stephen Rothwell
2011-03-04 17:13 ` Greg KH
2011-03-04 17:54 ` Mauro Carvalho Chehab
2011-03-04 21:23 ` Greg KH
2011-03-04 22:17 ` Mauro Carvalho Chehab
2011-03-04 5:38 Stephen Rothwell
2011-03-04 17:12 ` Greg KH
2011-03-04 5:38 Stephen Rothwell
2011-03-04 17:13 ` Greg KH
2011-03-04 5:38 Stephen Rothwell
2011-03-04 17:12 ` Greg KH
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=Y+nhLqlblKqae87H@kroah.com \
--to=greg@kroah.com \
--cc=Parthiban.Veerasooran@microchip.com \
--cc=christian.gromm@microchip.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.