From: Laurent Pinchart <laurent.pinchart@ideasonboard•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Greg KH <greg@kroah•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Mauro Carvalho Chehab <mchehab@infradead•org>
Subject: Re: linux-next: manual merge of the usb tree with the v4l-dvb tree
Date: Tue, 6 Jul 2010 10:18:20 +0200 [thread overview]
Message-ID: <201007061018.21674.laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <20100706175332.952fec90.sfr@canb.auug.org.au>
Hi Stephen,
On Tuesday 06 July 2010 09:53:32 Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/media/video/uvc/uvcvideo.h include/linux/usb/video.h between
> commits c3810b43416155d040a200e7a7301f379c8ae8a0 ("V4L/DVB: uvcvideo:
> Support menu controls in the control mapping API") and
> da1df555fcbb98a9d2054304ea54545d9ff523cf ("V4L/DVB: uvcvideo: Define
> control information bits using macros") from the v4l-dvb tree and commit
> bb03b5daa9ab053adcce09e939d4115a873abf39 ("USB: uvc: Move constants and
> structures definitions to linux/usb/video.h") from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary. Though
> moving the USB patch into the v4l-dvb tree may fix the conflicts as
> well ...
[snip]
> diff --cc include/linux/usb/video.h
> index 2d5b7fc,429c91a..0000000
> --- a/include/linux/usb/video.h
> +++ b/include/linux/usb/video.h
> @@@ -160,12 -160,402 +160,409 @@@
[snip]
> +/* 4.1.2. Control Capabilities */
> +#define UVC_CONTROL_CAP_GET (1 << 0)
> +#define UVC_CONTROL_CAP_SET (1 << 1)
> +#define UVC_CONTROL_CAP_DISABLED (1 << 2)
> +#define UVC_CONTROL_CAP_AUTOUPDATE (1 << 3)
> +#define UVC_CONTROL_CAP_ASYNCHRONOUS (1 << 4)
> +
Can you move those to the first part of the header file, with the other
constants ?
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2010-07-06 8:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-06 7:53 linux-next: manual merge of the usb tree with the v4l-dvb tree Stephen Rothwell
2010-07-06 8:18 ` Laurent Pinchart [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2012-05-21 6:06 Stephen Rothwell
2012-05-23 6:22 ` 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=201007061018.21674.laurent.pinchart@ideasonboard.com \
--to=laurent.pinchart@ideasonboard$(echo .)com \
--cc=greg@kroah$(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