Re: linux-next: manual merge of the kvms390 tree with the nds32 tree

2018-03-18 Thread Stephen Rothwell
Hi all, On Mon, 26 Feb 2018 13:34:45 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the kvms390 tree got a conflict in: > > drivers/video/console/Kconfig > > between commit: > > 2312dbf7462b ("drivers/video/concole: add negative dependency for > VGA_CONSOLE on nds32") > >

linux-next: manual merge of the kvms390 tree with the nds32 tree

2018-02-25 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: drivers/video/console/Kconfig between commit: 2312dbf7462b ("drivers/video/concole: add negative dependency for VGA_CONSOLE on nds32") from the nds32 tree and commits: 8da93aca3729 ("Kconfig : Remove HAS_IOMEM depe

Re: linux-next: manual merge of the kvms390 tree with the nds32 tree

2018-02-22 Thread Geert Uytterhoeven
On Fri, Feb 23, 2018 at 3:09 AM, Stephen Rothwell wrote: > Today's linux-next merge of the kvms390 tree got a conflict in: > > drivers/video/console/Kconfig > > between commit: > > 2312dbf7462b ("drivers/video/concole: add negative dependency for > VGA_CONSOLE on nds32") > > from the nds32 tr

linux-next: manual merge of the kvms390 tree with the nds32 tree

2018-02-22 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: drivers/video/console/Kconfig between commit: 2312dbf7462b ("drivers/video/concole: add negative dependency for VGA_CONSOLE on nds32") from the nds32 tree and commit: 2f1ca75f69f3 ("s390/setup : enable display supp