Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1282460
| From | Greg KH <greg@kroah.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the staging tree with the tree |
| Date | 2015-12-02 23:10 +0100 |
| Message-ID | <qBnL4-4Iv-9@gated-at.bofh.it> (permalink) |
| References | <qBm2C-3zv-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll 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