lkml.org 
[lkml]   [2009]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the staging tree with the net tree
    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.

    greg k-h


    \
     
     \ /
      Last update: 2009-07-29 15:27    [W:0.020 / U:89.024 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site