Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1533962
| From | Borislav Petkov <bp@alien8.de> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the edac-amd tree with the edac tree |
| Date | 2016-12-01 11:50 +0100 |
| Message-ID | <sJx6a-2JW-21@gated-at.bofh.it> (permalink) |
| References | <sIkXn-51e-1@gated-at.bofh.it> <sIpu1-883-19@gated-at.bofh.it> <sJaMi-52Z-23@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Wed, Nov 30, 2016 at 08:50:13AM -0200, Mauro Carvalho Chehab wrote:
> Fixed. If you have a stable branch, I can rebase it on the top
> of your patches, in order to avoid the confict at linux-next.
http://git.kernel.org/cgit/linux/kernel/git/bp/bp.git/log/?h=for-next
but with that fixed, shouldn't the merge work without a conflict?
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the edac-amd tree with the edac tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-11-28 04:40 +0100
Re: linux-next: manual merge of the edac-amd tree with the edac tree Borislav Petkov <bp@alien8.de> - 2016-11-28 09:30 +0100
Re: linux-next: manual merge of the edac-amd tree with the edac tree Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2016-11-30 12:00 +0100
Re: linux-next: manual merge of the edac-amd tree with the edac tree Borislav Petkov <bp@alien8.de> - 2016-12-01 11:50 +0100
Re: linux-next: manual merge of the edac-amd tree with the edac tree Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2016-12-01 13:10 +0100
Re: linux-next: manual merge of the edac-amd tree with the edac tree Borislav Petkov <bp@alien8.de> - 2016-12-01 19:20 +0100
csiph-web