lkml.org 
[lkml]   [2020]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the realtek tree with Linus' tree
From
Date
Hi,

Am 13.04.20 um 00:50 schrieb Stephen Rothwell:
> Today's linux-next merge of the realtek tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 3b50142d8528 ("MAINTAINERS: sort field names for all entries")
>
> from Linus' tree and commit:
>
> d6656fa4c621 ("ARM: Prepare Realtek RTD1195")
>
> from the realtek tree.

Already fixed on v5.8/soc but not yet merged into for-next - done now.

Cheers,
Andreas

--
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer
HRB 36809 (AG Nürnberg)

\
 
 \ /
  Last update: 2020-04-13 02:23    [W:0.046 / U:0.208 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site