Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1282335
| From | Mark Brown <broonie@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the staging tree with the tree |
| Date | 2015-12-02 21:20 +0100 |
| Message-ID | <qBm2C-3zv-3@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
[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.
Back to linux.kernel | Previous | Next — 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