From: Greg KH <greg@kroah.com>
To: David Miller <davem@davemloft.net>
Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, kaber@trash.net
Subject: Re: linux-next: manual merge of the staging tree with the net tree
Date: Wed, 29 Jul 2009 07:17:50 -0700 [thread overview]
Message-ID: <20090729141750.GA28973@kroah.com> (raw)
In-Reply-To: <20090729.064659.193718905.davem@davemloft.net>
On Wed, Jul 29, 2009 at 06:46:59AM -0700, David Miller wrote:
> From: Greg KH <greg@kroah.com>
> Date: Wed, 29 Jul 2009 05:44:06 -0700
>
> > On Wed, Jul 29, 2009 at 04:52:11PM +1000, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the staging tree got a conflict in
> >> drivers/staging/epl/VirtualEthernetLinux.c between commit
> >> 6ed106549d17474ca17a16057f4c0ed4eba5a7ca ("net: use NETDEV_TX_OK instead
> >> of 0 in ndo_start_xmit() functions") from the net tree and commit
> >> 49acb975a21d150c4beba4e581f3e1d004dd2867 ("Staging: remove epl driver")
> >> from the staging tree.
> >>
> >> The latter just removes the file, so I did that.
> >
> > Thanks a lot. Yes, the epl driver has been dropped from staging, so
> > that's the right thing to do.
>
> Please make sure you integrate that change, if the driver is
> simply moving out of staging to somewhere else.
Nope, the driver is getting dropped into the bin, it's not maintained
upstream, no one cares about it, and is a total and complete mess.
thanks,
greg k-h
next prev parent reply other threads:[~2009-07-29 14:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-29 6:52 linux-next: manual merge of the staging tree with the net tree Stephen Rothwell
2009-07-29 12:44 ` Greg KH
2009-07-29 13:46 ` David Miller
2009-07-29 14:17 ` Greg KH [this message]
2009-09-04 7:32 Stephen Rothwell
2009-09-04 14:52 ` Greg KH
2011-07-07 5:28 Stephen Rothwell
2011-07-07 13:43 ` Greg KH
2011-07-07 5:44 Stephen Rothwell
2011-07-07 13:43 ` Greg KH
2011-07-22 5:42 Stephen Rothwell
2011-08-26 3:47 Stephen Rothwell
2011-08-26 4:33 ` Greg KH
2011-08-26 5:35 ` Larry Finger
2011-10-06 4:58 Stephen Rothwell
2011-10-06 8:59 ` 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-13 5:43 Stephen Rothwell
2011-10-13 6:12 ` Greg KH
2011-10-13 9:08 ` Arend van Spriel
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=20090729141750.GA28973@kroah.com \
--to=greg@kroah.com \
--cc=davem@davemloft.net \
--cc=kaber@trash.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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).