From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ruslan Pisarev <ruslanpisarev@gmail.com>,
Mauro Carvalho Chehab <mchehab@redhat.com>,
Gorskin Ilya <revent82@gmail.com>
Subject: Re: linux-next: manual merge of the staging-next tree with the v4l-dvb tree
Date: Tue, 19 Oct 2010 08:53:24 -0700 [thread overview]
Message-ID: <20101019155324.GJ4589@kroah.com> (raw)
In-Reply-To: <20101019172331.89476ae0.sfr@canb.auug.org.au>
On Tue, Oct 19, 2010 at 05:23:31PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> On Tue, 19 Oct 2010 17:12:33 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the staging-next tree got a conflict in
> > drivers/staging/cx25821/cx25821-audio-upstream.c between commit
> > d6a0215fc954bd16a21bad94a3292f080d9f6f04 ("[media] Staging: cx25821: fix
> > braces and space coding style issues") from the v4l-dvb tree and commit
> > bb59a4c539140592723e806e852ee171da0eb3eb ("Staging: cx25821: clenup
> > warnings found by checkpatch.pl tool in cx25821-audio-upstream.c and
> > cx25821-audio.h") from the staging-next tree.
> >
> > Basically different versions of the same patch. I fixed it up.
>
> Fixed conflicts in drivers/staging/cx25821/cx25821-audio.h as well.
Thanks for doing this, I appreciate it.
greg k-h
next prev parent reply other threads:[~2010-10-19 15:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-19 6:12 linux-next: manual merge of the staging-next tree with the v4l-dvb tree Stephen Rothwell
2010-10-19 6:23 ` Stephen Rothwell
2010-10-19 15:53 ` Greg KH [this message]
2010-10-21 10:58 ` Mauro Carvalho Chehab
-- strict thread matches above, loose matches on Subject: below --
2010-07-28 5:27 Stephen Rothwell
2010-07-28 13:51 ` Greg KH
2010-07-06 7:53 Stephen Rothwell
2010-07-07 15:14 ` Greg KH
2010-04-28 6:07 Stephen Rothwell
2010-04-28 15:26 ` Greg KH
2010-04-28 19:06 ` 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=20101019155324.GJ4589@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=revent82@gmail.com \
--cc=ruslanpisarev@gmail.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox