From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "Mauro Carvalho Chehab" <mchehab@infradead•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Joe Perches" <joe@perches•com>,
"Kristina Martšenko" <kristina.martsenko@gmail•com>
Subject: Re: linux-next: manual merge of the staging tree with the tree
Date: Fri, 1 Aug 2014 00:38:00 -0700 [thread overview]
Message-ID: <20140801073800.GB31866@kroah.com> (raw)
In-Reply-To: <20140801162142.24086152@canb.auug.org.au>
On Fri, Aug 01, 2014 at 04:21:42PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> MAINTAINERS between commit 7eea35fe3df8 ("[media] MAINTAINERS: Update
> go7007 pattern") from the v4l-dvb tree and commit 0d317b91d6d8
> ("staging: frontier: remove driver") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2014-08-01 7:38 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-01 6:21 linux-next: manual merge of the staging tree with the tree Stephen Rothwell
2014-08-01 7:38 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-12-02 20:17 Mark Brown
2015-12-02 22:07 ` Greg KH
2015-12-03 0:07 ` Mark Brown
2014-07-11 5:21 Stephen Rothwell
2014-07-11 5:32 ` Sachin Kamat
2014-07-11 6:10 ` Stephen Rothwell
2014-07-11 6:22 ` Sachin Kamat
2014-07-12 16:53 ` Greg KH
2014-03-13 0:50 Mark Brown
2014-03-13 9:17 ` Laurent Pinchart
2014-03-20 15:44 ` Grant Likely
2014-03-20 17:09 ` Mauro Carvalho Chehab
2014-03-20 18:51 ` Grant Likely
2014-03-12 1:37 Mark Brown
2014-03-12 1:32 Mark Brown
2014-03-12 1:49 ` Greg KH
2014-03-12 1:27 Mark Brown
2014-03-12 1:48 ` Greg KH
2010-11-10 2:24 Stephen Rothwell
2010-11-10 18:40 ` Greg KH
2009-03-19 10:12 Stephen Rothwell
2009-03-19 15:32 ` Greg KH
2009-03-19 15:53 ` Greg KH
2009-03-19 21:42 ` 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=20140801073800.GB31866@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=joe@perches$(echo .)com \
--cc=kristina.martsenko@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@infradead$(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