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

[Greg KH]

On Wed, Dec 02, 2015 at 08:17:43PM +0000, Mark Brown wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/rtl8188eu/include/phy.h between Linus' tree and commit
> "staging: rtl8188eu: using unique names is good" from the staging tree.
> 
> It looks like the patch is already applied so I skipped it.

Sounds good thanks.

Note, the "Subject" here looks a bit odd :)

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/