Re: linux-next: manual merge of the kspp tree with the mips tree

2021-02-23 Thread Alexander Lobakin
From: Stephen Rothwell Date: Tue, 23 Feb 2021 10:49:50 +1100 > Hi all, Hi, > On Mon, 15 Feb 2021 07:47:26 +1100 Stephen Rothwell > wrote: > > > > On Mon, 18 Jan 2021 15:08:04 +1100 Stephen Rothwell > > wrote: > > > > > > Today's linux-next merge of the kspp tree got a conflict in: > > > >

Re: linux-next: manual merge of the kspp tree with the mips tree

2021-02-22 Thread Stephen Rothwell
Hi all, On Mon, 15 Feb 2021 07:47:26 +1100 Stephen Rothwell wrote: > > On Mon, 18 Jan 2021 15:08:04 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the kspp tree got a conflict in: > > > > include/asm-generic/vmlinux.lds.h > > > > between commits: > > > >

Re: linux-next: manual merge of the kspp tree with the mips tree

2021-02-14 Thread Stephen Rothwell
Hi all, On Mon, 18 Jan 2021 15:08:04 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the kspp tree got a conflict in: > > include/asm-generic/vmlinux.lds.h > > between commits: > > 9a427556fb8e ("vmlinux.lds.hf41b233de0ae: catch compound literals into data > and BSS") >

linux-next: manual merge of the kspp tree with the mips tree

2021-01-17 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kspp tree got a conflict in: include/asm-generic/vmlinux.lds.h between commits: 9a427556fb8e ("vmlinux.lds.hf41b233de0ae: catch compound literals into data and BSS") f41b233de0ae ("vmlinux.lds.h: catch UBSAN's "unnamed data" into data") from the