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

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Mark Brown <broonie@kernel.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the staging tree with the tree
Date	Thu, 03 Dec 2015 01:10:01 +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>
X-Original-To	Greg KH <greg@kroah.com>
MIME-Version	1.0
Content-Type	multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="pHQZnkZJcpgkVomt"
Content-Disposition	inline
X-Cookie	A beer delayed is a beer denied.
User-Agent	Mutt/1.5.24 (2015-08-30)
X-Sa-Exim-Connect-IP	94.175.94.161
X-Sa-Exim-Mail-From	broonie@sirena.org.uk
X-Sa-Exim-Version	4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000)
X-Sa-Exim-Scanned	Yes (on mezzanine.sirena.org.uk)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	43
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Thu, 3 Dec 2015 00:07:17 +0000
X-Original-Message-ID	<20151203000717.GN1929@sirena.org.uk>
X-Original-References	<20151202201743.15940e7e8853122af01ddff4@kernel.org> <20151202220750.GA23818@kroah.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1282609

Show key headers only | 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