From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"\"Jean-François Moine\"" <moinejf@free•fr>,
"Mauro Carvalho Chehab" <mchehab@redhat•com>,
"Daniel Mack" <daniel@caiaq•de>
Subject: linux-next: manual merge of the usb tree with the v4l-dvb tree
Date: Wed, 12 May 2010 15:57:50 +1000 [thread overview]
Message-ID: <20100512155750.c6633e4c.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/media/video/gspca/gspca.c between commit
659a02869f4a8be95df9efa76af02e53e400555f ("V4L/DVB: gspca - main: Convert
wMaxPacketSize from little endian 16 to cpu") from the v4l-dvb tree and
commit 42b4658241d4c16c838daf9d63c0029cd7269fe0 ("USB: rename
usb_buffer_alloc() and usb_buffer_free() users") from the usb tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/media/video/gspca/gspca.c
index efe6159,00713f8..0000000
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@@ -213,7 -213,7 +213,7 @@@ static int alloc_and_submit_int_urb(str
goto error;
}
- buffer = usb_buffer_alloc(dev, buffer_len,
- buffer = usb_alloc_coherent(dev, ep->wMaxPacketSize,
++ buffer = usb_alloc_coherent(dev, buffer_len,
GFP_KERNEL, &urb->transfer_dma);
if (!buffer) {
ret = -ENOMEM;
next reply other threads:[~2010-05-12 5:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-12 5:57 Stephen Rothwell [this message]
2010-05-12 19:49 ` linux-next: manual merge of the usb tree with the v4l-dvb tree Greg KH
-- 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
2012-05-21 6:06 Stephen Rothwell
2012-05-23 6:22 ` 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=20100512155750.c6633e4c.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel@caiaq$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@redhat$(echo .)com \
--cc=moinejf@free$(echo .)fr \
/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