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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 925 bytes --]

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 mips tree and commit:

  dc5723b02e52 ("kbuild: add support for Clang LTO")

from the kspp tree.

I fixed it up (9a427556fb8e and dc5723b02e52 made the same change to
DATA_MAIN, which conflicted with the change in f41b233de0ae) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1149 bytes --]

Hi all,

On Mon, 18 Jan 2021 15:08:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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")
>   f41b233de0ae ("vmlinux.lds.h: catch UBSAN's "unnamed data" into data")
> 
> from the mips tree and commit:
> 
>   dc5723b02e52 ("kbuild: add support for Clang LTO")
> 
> from the kspp tree.
> 
> I fixed it up (9a427556fb8e and dc5723b02e52 made the same change to
> DATA_MAIN, which conflicted with the change in f41b233de0ae) and can
> carry the fix as necessary. This is now fixed as far as linux-next is
> concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging. You may
> also want to consider cooperating with the maintainer of the
> conflicting tree to minimise any particularly complex conflicts.

With the merge window about to open, this is a reminder that this
conflict still exists.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1357 bytes --]

Hi all,

On Mon, 15 Feb 2021 07:47:26 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> On Mon, 18 Jan 2021 15:08:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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")
> >   f41b233de0ae ("vmlinux.lds.h: catch UBSAN's "unnamed data" into data")
> > 
> > from the mips tree and commit:
> > 
> >   dc5723b02e52 ("kbuild: add support for Clang LTO")
> > 
> > from the kspp tree.
> > 
> > I fixed it up (9a427556fb8e and dc5723b02e52 made the same change to
> > DATA_MAIN, which conflicted with the change in f41b233de0ae) and can
> > carry the fix as necessary. This is now fixed as far as linux-next is
> > concerned, but any non trivial conflicts should be mentioned to your
> > upstream maintainer when your tree is submitted for merging. You may
> > also want to consider cooperating with the maintainer of the
> > conflicting tree to minimise any particularly complex conflicts.  
> 
> With the merge window about to open, this is a reminder that this
> conflict still exists.

This is now a conflict between the kspp tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Alexander Lobakin]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 23 Feb 2021 10:49:50 +1100

> Hi all,

Hi,

> On Mon, 15 Feb 2021 07:47:26 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 18 Jan 2021 15:08:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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")
> > >   f41b233de0ae ("vmlinux.lds.h: catch UBSAN's "unnamed data" into data")
> > >
> > > from the mips tree and commit:
> > >
> > >   dc5723b02e52 ("kbuild: add support for Clang LTO")
> > >
> > > from the kspp tree.
> > >
> > > I fixed it up (9a427556fb8e and dc5723b02e52 made the same change to
> > > DATA_MAIN, which conflicted with the change in f41b233de0ae) and can
> > > carry the fix as necessary. This is now fixed as far as linux-next is
> > > concerned, but any non trivial conflicts should be mentioned to your
> > > upstream maintainer when your tree is submitted for merging. You may
> > > also want to consider cooperating with the maintainer of the
> > > conflicting tree to minimise any particularly complex conflicts.
> >
> > With the merge window about to open, this is a reminder that this
> > conflict still exists.
>
> This is now a conflict between the kspp tree and Linus' tree.

Kees prepared a Git pull of kspp tree for Linus, this will be resolved
soon.

> --
> Cheers,
> Stephen Rothwell

Al