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,
"Mauro Carvalho Chehab" <mchehab@infradead.org>,
"\"Ezequiel García\"" <elezegarcia@gmail.com>
Subject: Re: linux-next: manual merge of the usb tree with the v4l-dvb tree
Date: Tue, 22 May 2012 23:22:17 -0700 [thread overview]
Message-ID: <20120523062217.GA19896@kroah.com> (raw)
In-Reply-To: <20120521160624.a5e16748fb11670778ea9b3f@canb.auug.org.au>
On Mon, May 21, 2012 at 04:06:24PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/staging/media/easycap/easycap_main.c between various commits from
> the v4l-dvb tree and commit 5df773120477 ("USB: Staging: media: easycap:
> remove err() usage") from the usb tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
This looks correct, thanks.
greg k-h
next prev parent reply other threads:[~2012-05-23 6:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-21 6:06 linux-next: manual merge of the usb tree with the v4l-dvb tree Stephen Rothwell
2012-05-23 6:22 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-07-06 7:53 Stephen Rothwell
2010-07-06 8:18 ` Laurent Pinchart
2010-07-06 8:51 ` Stephen Rothwell
2010-07-06 11:10 ` Laurent Pinchart
2010-07-06 12:34 ` Mauro Carvalho Chehab
2010-07-07 15:13 ` Greg KH
2010-07-13 15:34 ` Mauro Carvalho Chehab
2010-07-13 17:23 ` Laurent Pinchart
2010-07-24 15:32 ` Mauro Carvalho Chehab
2010-07-26 8:24 ` Laurent Pinchart
2010-07-26 14:01 ` Mauro Carvalho Chehab
2010-07-26 21:42 ` Greg KH
2010-05-12 5:57 Stephen Rothwell
2010-05-12 19:49 ` 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=20120523062217.GA19896@kroah.com \
--to=greg@kroah.com \
--cc=elezegarcia@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox