From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Uma Sharma <uma.sharma523@gmail.com>,
Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>,
Antti Palosaari <crope@iki.fi>
Subject: linux-next: manual merge of the staging tree with the v4l-dvb tree
Date: Tue, 18 Mar 2014 17:15:06 +1100 [thread overview]
Message-ID: <20140318171506.d94275bb6dcad73899fd39fe@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1104 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/media/msi3101/sdr-msi3101.c between commit 3d0c8fa3c5a0
("[media] msi3101: convert to SDR API") from the v4l-dvb tree and commit
6e878c0299c1 ("staging: media/msi3101/sdr-msi3101.c removed warning")
from the staging tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/media/msi3101/sdr-msi3101.c
index 011db2c08014,5a0400fdb98c..000000000000
--- a/drivers/staging/media/msi3101/sdr-msi3101.c
+++ b/drivers/staging/media/msi3101/sdr-msi3101.c
@@@ -132,7 -411,7 +132,7 @@@ struct msi3101_state
unsigned int vb_full; /* vb is full and packets dropped */
struct urb *urbs[MAX_ISO_BUFS];
- int (*convert_stream) (struct msi3101_state *s, u8 *dst, u8 *src,
- int (*convert_stream)(struct msi3101_state *s, u32 *dst, u8 *src,
++ int (*convert_stream)(struct msi3101_state *s, u8 *dst, u8 *src,
unsigned int src_len);
/* Controls */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-18 6:15 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-18 6:15 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-13 2:13 linux-next: manual merge of the staging tree with the v4l-dvb tree Stephen Rothwell
2023-02-13 7:05 ` Greg KH
2020-03-23 4:18 Stephen Rothwell
2020-03-23 9:56 ` Greg KH
2020-03-19 3:44 Stephen Rothwell
2020-03-19 8:30 ` Greg KH
2019-04-26 6:06 Stephen Rothwell
2019-04-27 6:36 ` Greg KH
2019-05-08 1:54 ` Stephen Rothwell
2019-04-04 2:43 Stephen Rothwell
2018-12-10 5:53 Stephen Rothwell
2018-10-08 4:53 Stephen Rothwell
2018-10-08 4:47 Stephen Rothwell
2018-05-17 4:17 Stephen Rothwell
2018-05-17 7:22 ` Greg KH
2018-05-17 10:06 ` Mauro Carvalho Chehab
2018-05-26 4:45 ` Stephen Rothwell
2017-11-02 4:30 Stephen Rothwell
2017-04-11 3:32 Stephen Rothwell
2017-04-06 3:34 Stephen Rothwell
2017-04-06 18:58 ` Sean Young
2017-04-06 19:19 ` Greg KH
2017-04-06 20:39 ` Sean Young
2017-04-06 21:51 ` Stephen Rothwell
2017-02-06 4:31 Stephen Rothwell
2017-02-06 8:37 ` Greg KH
2016-03-04 5:24 Stephen Rothwell
2016-03-04 16:58 ` Greg KH
2015-05-11 5:28 Stephen Rothwell
2015-05-11 18:34 ` Greg KH
2015-03-24 5:29 Stephen Rothwell
2014-11-24 8:10 Stephen Rothwell
2014-11-24 8:09 Stephen Rothwell
2014-11-05 4:37 Stephen Rothwell
2014-11-05 4:31 Stephen Rothwell
2014-11-05 4:29 Stephen Rothwell
2014-11-06 2:19 ` Greg KH
2014-07-16 6:46 Stephen Rothwell
2014-07-16 20:52 ` Greg KH
2014-03-17 7:55 Stephen Rothwell
2014-03-17 11:01 ` Mauro Carvalho Chehab
2014-03-17 18:29 ` Greg KH
[not found] ` < 20140317162937.2ccdec83@infradead.org>
2014-03-17 19:29 ` Mauro Carvalho Chehab
2014-03-17 22:27 ` Russell King
2014-03-19 15:30 ` Greg KH
2014-03-21 12:24 ` Grant Likely
2014-03-21 14:37 ` Grant Likely
2011-09-27 6:10 Stephen Rothwell
2011-09-27 14:18 ` Greg KH
2011-09-27 20:14 ` Paul Gortmaker
2011-07-16 13:03 Stephen Rothwell
2011-07-17 9:15 ` Greg KH
2011-03-04 5:39 Stephen Rothwell
2011-03-04 17:14 ` Greg KH
2011-03-04 5:39 Stephen Rothwell
2011-03-04 17:14 ` Greg KH
2011-03-04 5:39 Stephen Rothwell
2011-03-04 17:13 ` Greg KH
2011-03-04 17:54 ` Mauro Carvalho Chehab
2011-03-04 21:23 ` Greg KH
2011-03-04 22:17 ` Mauro Carvalho Chehab
2011-03-04 5:38 Stephen Rothwell
2011-03-04 17:12 ` Greg KH
2011-03-04 5:38 Stephen Rothwell
2011-03-04 17:13 ` Greg KH
2011-03-04 5:38 Stephen Rothwell
2011-03-04 17:12 ` 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=20140318171506.d94275bb6dcad73899fd39fe@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=crope@iki.fi \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=peter.p.waskiewicz.jr@intel.com \
--cc=uma.sharma523@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).