linux-next: manual merge of the set_fs tree with the tip tree

linux-next: manual merge of the set_fs tree with the tip tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the set_fs tree got a conflict in:

  lib/debugobjects.c

between commit:

  0f85c4805184 ("debugobjects: Convert to DEFINE_SHOW_ATTRIBUTE")

from the tip tree and commit:

  4d4901c6d748 ("seq_file: switch over direct seq_read method calls to seq_read_iter")

from the set_fs tree.

I fixed it up (I just used the former) 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 set_fs tree with the tip tree

[Stephen Rothwell]

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

Hi all,

On Mon, 27 Jul 2020 21:04:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the set_fs tree got a conflict in:
> 
>   lib/debugobjects.c
> 
> between commit:
> 
>   0f85c4805184 ("debugobjects: Convert to DEFINE_SHOW_ATTRIBUTE")
> 
> from the tip tree and commit:
> 
>   4d4901c6d748 ("seq_file: switch over direct seq_read method calls to seq_read_iter")
> 
> from the set_fs tree.
> 
> I fixed it up (I just used the former) 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.

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

-- 
Cheers,
Stephen Rothwell

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