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, Hans Verkuil <hverkuil@xs4all.nl>
Subject: Re: linux-next: manual merge of the v4l-dvb tree
Date: Tue, 19 Aug 2008 12:55:14 -0700 [thread overview]
Message-ID: <20080819195514.GA10502@kroah.com> (raw)
In-Reply-To: <20080819141113.1a0a9819.sfr@canb.auug.org.au>
On Tue, Aug 19, 2008 at 02:11:13PM +1000, Stephen Rothwell wrote:
> Hi Mauro,
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/zr364xx.c between commit
> 8aac48f4f2460b00468fd5f1101addf3df04e94c ("USB: remove info() macro from
> usb.h") from the usb tree and commit
> dcdbac23cc15325ae04696803537b35bb0bcb3cb ("V4L/DVB (8613): v4l: move BKL
> down to the driver level") from the v4l-dvb tree.
>
> A context clashing change and addition. I fixed it up (see below) and
> can carry it.
Looks fine to me, thanks for doing this.
greg k-h
next prev parent reply other threads:[~2008-08-19 20:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-19 4:11 linux-next: manual merge of the v4l-dvb tree Stephen Rothwell
2008-08-19 5:59 ` Hans Verkuil
2008-08-19 19:55 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-05-13 3:00 Stephen Rothwell
2010-05-13 5:18 ` Mauro Carvalho Chehab
2010-05-13 5:59 ` Stephen Rothwell
2008-10-14 7:28 Stephen Rothwell
2008-10-27 7:16 ` Stephen Rothwell
2008-10-28 11:48 ` Mauro Carvalho Chehab
2008-10-28 12:04 ` Stephen Rothwell
2008-09-01 3:22 Stephen Rothwell
2008-09-01 3:14 Stephen Rothwell
2008-09-01 3:42 ` Stephen Rothwell
2008-09-04 4:44 ` Mauro Carvalho Chehab
2008-07-29 3:03 Stephen Rothwell
2008-07-04 4:45 Stephen Rothwell
2008-06-30 4:56 Stephen Rothwell
2008-06-30 11:14 ` Mauro Carvalho Chehab
2008-06-30 4:49 Stephen Rothwell
2008-06-30 4:44 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=20080819195514.GA10502@kroah.com \
--to=greg@kroah.com \
--cc=hverkuil@xs4all.nl \
--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 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.