From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Palash Bandyopadhyay <Palash.Bandyopadhyay@conexant.com>,
Mauro Carvalho Chehab <mchehab@redhat.com>,
Scott Kidder <scott.kidder11@gmail.com>
Subject: Re: linux-next: manual merge of the staging-next tree with the v4l-dvb tree
Date: Wed, 7 Jul 2010 08:14:19 -0700 [thread overview]
Message-ID: <20100707151419.GC2121@kroah.com> (raw)
In-Reply-To: <20100706175337.bec9305a.sfr@canb.auug.org.au>
On Tue, Jul 06, 2010 at 05:53:37PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/cx25821/cx25821-audups11.c between commit
> e302c8255a198a567dab3a4ace7bd0222a6dc037 ("V4L/DVB: cx25821: Removed
> duplicate code and cleaned up") from the v4l-dvb tree and commit
> 231ded903f2f30b2bcdbf6672c7197187e3bb1ee ("Staging: cx25821: added KERN_
> facility levels") from the staging-next tree.
>
> The former moved all te code in this file into other files, so I
> effectively just dropped the usb patch by deleting this file.
That sounds correct to me, thanks for doing this.
greg k-h
next prev parent reply other threads:[~2010-07-07 15:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-06 7:53 linux-next: manual merge of the staging-next tree with the v4l-dvb tree Stephen Rothwell
2010-07-07 15:14 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
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
2010-07-28 5:27 Stephen Rothwell
2010-07-28 13:51 ` Greg KH
2010-04-28 6:07 Stephen Rothwell
2010-04-28 15:26 ` Greg KH
2010-04-28 19:06 ` 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=20100707151419.GC2121@kroah.com \
--to=greg@kroah.com \
--cc=Palash.Bandyopadhyay@conexant.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=scott.kidder11@gmail.com \
--cc=sfr@canb.auug.org.au \
/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