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,
"Prashant P. Shah" <pshah.mumbai@gmail•com>,
Rusty Russell <rusty@rustcorp•com.au>
Subject: Re: linux-next: manual merge of the staging-next tree with the rr tree
Date: Mon, 17 May 2010 11:01:56 -0700 [thread overview]
Message-ID: <20100517180156.GD16419@kroah.com> (raw)
In-Reply-To: <20100517154452.93fbac66.sfr@canb.auug.org.au>
On Mon, May 17, 2010 at 03:44:52PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/rtl8187se/r8180_core.c between commit
> 9080984577cb3e04226d94c8f733534b60541f01
> ("param:remove-useless-writable-charp") from the rr tree and commit
> bbfb56520c8da666383c08220985495ff918d4ad ("") from the staging-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2010-05-17 18:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-17 5:44 linux-next: manual merge of the staging-next tree with the rr tree Stephen Rothwell
2010-05-17 18:01 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-05-10 5:15 Stephen Rothwell
2010-05-10 16:41 ` 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=20100517180156.GD16419@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pshah.mumbai@gmail$(echo .)com \
--cc=rusty@rustcorp$(echo .)com.au \
--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