From: Hans Verkuil <hverkuil@xs4all•nl>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Mauro Carvalho Chehab <mchehab@infradead•org>,
linux-next@vger•kernel.org, Greg KH <greg@kroah•com>
Subject: Re: linux-next: manual merge of the v4l-dvb tree
Date: Tue, 19 Aug 2008 07:59:01 +0200 [thread overview]
Message-ID: <200808190759.01899.hverkuil@xs4all.nl> (raw)
In-Reply-To: <20080819141113.1a0a9819.sfr@canb.auug.org.au>
On Tuesday 19 August 2008 06:11:13 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.
Signed-off-by: Hans Verkuil <hverkuil@xs4al•nl>
Thanks!
Hans
next prev parent reply other threads:[~2008-08-19 5:59 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 [this message]
2008-08-19 19:55 ` Greg KH
-- 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=200808190759.01899.hverkuil@xs4all.nl \
--to=hverkuil@xs4all$(echo .)nl \
--cc=greg@kroah$(echo .)com \
--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