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,
Wouter Van Rooy <wouter.vanrooy@gmail•com>,
Mauro Carvalho Chehab <mchehab@infradead•org>
Subject: linux-next: manual merge of the staging-next tree with the v4l-dvb tree
Date: Wed, 28 Apr 2010 16:07:49 +1000 [thread overview]
Message-ID: <20100428160749.52da847a.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 625 bytes --]
Hi Greg,
Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/cx25821/cx25821-alsa.c between commit
4e0c923a0d23f86c7331b32bc2aeb280e10e029e ("V4L/DVB: Staging: cx25821: fix
coding style issues in cx25821-alsa.c") from the v4l-dvb tree and commit
98a178beaaf4c9a0acc4815807be51425b91f0a7 ("Staging: cx25821 fixed C99
comments, white spaces and unnecessary braces") from the staging-next
tree.
I used the v4l-dvb versions of the conflicting bits (they looked neater
to me).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-04-28 6:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-28 6:07 Stephen Rothwell [this message]
2010-04-28 15:26 ` linux-next: manual merge of the staging-next tree with the v4l-dvb tree Greg KH
2010-04-28 19:06 ` Mauro Carvalho Chehab
-- strict thread matches above, loose matches on Subject: below --
2010-07-06 7:53 Stephen Rothwell
2010-07-07 15:14 ` Greg KH
2010-07-28 5:27 Stephen Rothwell
2010-07-28 13:51 ` Greg KH
2010-10-19 6:12 Stephen Rothwell
2010-10-19 6:23 ` Stephen Rothwell
2010-10-19 15:53 ` Greg KH
2010-10-21 10:58 ` Mauro Carvalho Chehab
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=20100428160749.52da847a.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--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=wouter.vanrooy@gmail$(echo .)com \
/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