Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1282335 > unrolled thread
| Started by | Mark Brown <broonie@kernel.org> |
|---|---|
| First post | 2015-12-02 21:20 +0100 |
| Last post | 2015-12-03 01:10 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
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
| From | Mark Brown <broonie@kernel.org> |
|---|---|
| Date | 2015-12-02 21:20 +0100 |
| Subject | linux-next: manual merge of the staging tree with the tree |
| Message-ID | <qBm2C-3zv-3@gated-at.bofh.it> |
[Multipart message — attachments visible in raw view] — view raw
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.
[toc] | [next] | [standalone]
| From | Greg KH <greg@kroah.com> |
|---|---|
| Date | 2015-12-02 23:10 +0100 |
| Message-ID | <qBnL4-4Iv-9@gated-at.bofh.it> |
| In reply to | #1282335 |
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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Mark Brown <broonie@kernel.org> |
|---|---|
| Date | 2015-12-03 01:10 +0100 |
| Message-ID | <qBpDb-5UD-3@gated-at.bofh.it> |
| In reply to | #1282460 |
[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.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web