Messages in this thread | | | Date | Fri, 4 Sep 2009 07:52:06 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the net tree |
| |
On Fri, Sep 04, 2009 at 05:32:25PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/at76_usb/at76_usb.c between commits > 6ed106549d17474ca17a16057f4c0ed4eba5a7ca ("net: use NETDEV_TX_OK instead > of 0 in ndo_start_xmit() functions") and > 0fc0b732eaa38beb93a6fb62f77c7bd9622c76ec ("netdev: drivers should make > ethtool_ops const") from the net tree and commit > c0e03fabb4f2a6e48f6e0b55729b26a599a2bd02 ("Staging: remove at76_usb > wireless driver") from the staging tree. > > The latter just removes the driver, so I did that.
Thanks, that's an easy fix :)
greg k-h
| |