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,
Jiri Pirko <jpirko@redhat.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Larry Finger <Larry.Finger@lwfinger.net>
Subject: Re: linux-next: manual merge of the staging tree with the net tree
Date: Thu, 25 Aug 2011 21:33:57 -0700 [thread overview]
Message-ID: <20110826043357.GA17686@kroah.com> (raw)
In-Reply-To: <20110826134705.0d5b6767777f0af2f8667731@canb.auug.org.au>
On Fri, Aug 26, 2011 at 01:47:05PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/rtl8192e/r8192E_core.c between commit afc4b13df143 ("net:
> remove use of ndo_set_multicast_list in drivers") from the net tree and
> commit 09505184ec3d ("staging: rtl8192e: Remove files that are not used")
> from the staging tree.
>
> The latter removed the file, so I did that.
Thanks, that should be the correct thing :)
greg k-h
next prev parent reply other threads:[~2011-08-26 4:34 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-26 3:47 linux-next: manual merge of the staging tree with the net tree Stephen Rothwell
2011-08-26 4:33 ` Greg KH [this message]
2011-08-26 5:35 ` Larry Finger
-- strict thread matches above, loose matches on Subject: below --
2011-10-13 5:43 Stephen Rothwell
2011-10-13 6:12 ` Greg KH
2011-10-13 9:08 ` Arend van Spriel
2011-10-06 5:04 Stephen Rothwell
2011-10-06 5:56 ` David Miller
2011-10-06 6:16 ` Stephen Rothwell
2011-10-06 4:58 Stephen Rothwell
2011-10-06 8:59 ` Arend van Spriel
2011-07-22 5:42 Stephen Rothwell
2011-07-07 5:44 Stephen Rothwell
2011-07-07 13:43 ` Greg KH
2011-07-07 5:28 Stephen Rothwell
2011-07-07 13:43 ` Greg KH
2009-09-04 7:32 Stephen Rothwell
2009-09-04 14:52 ` Greg KH
2009-07-29 6:52 Stephen Rothwell
2009-07-29 12:44 ` Greg KH
2009-07-29 13:46 ` David Miller
2009-07-29 14:17 ` 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=20110826043357.GA17686@kroah.com \
--to=greg@kroah.com \
--cc=Larry.Finger@lwfinger.net \
--cc=davem@davemloft.net \
--cc=jpirko@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).