Re: linux-next: manual merge of the staging tree with the net-next tree

[Greg KH]

On Wed, May 28, 2014 at 06:28:24PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/rtl8821ae/core.c between commit 77be2c54c5bd
> ("mac80211: add vif to flush call") from the net-next tree and commit
> 0cd05ba54a53 ("staging: rtl8821ae: core.c: Remove version specific
> code") from the staging tree.
> 
> I fixed it up (the former is a suberset of the latter for this
> particular conflict) and can carry the fix as necessary (no action is
> required).

Sounds good, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/