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

From	Mark Brown <broonie@kernel.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the staging tree with the tree
Date	2015-12-03 01:10 +0100
Message-ID	<qBpDb-5UD-3@gated-at.bofh.it> (permalink)
References	<qBm2C-3zv-3@gated-at.bofh.it> <qBnL4-4Iv-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

On Wed, Dec 02, 2015 at 02:07:50PM -0800, Greg KH wrote:
> 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 :)

Well, I couldn't entirely figure out what it was a merge issue with.

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the staging tree with the  tree Mark Brown <broonie@kernel.org> - 2015-12-02 21:20 +0100
  Re: linux-next: manual merge of the staging tree with the  tree Greg KH <greg@kroah.com> - 2015-12-02 23:10 +0100
    Re: linux-next: manual merge of the staging tree with the  tree Mark Brown <broonie@kernel.org> - 2015-12-03 01:10 +0100

csiph-web