Messages in this thread | | | Subject | Re: linux-next: manual merge of the realtek tree with Linus' tree | From | Andreas Färber <> | Date | Mon, 13 Apr 2020 02:22:49 +0200 |
| |
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)
| |