linux-next: manual merge of the akpm-current tree with the m68knommu tree

linux-next: manual merge of the akpm-current tree with the m68knommu tree

[Stephen Rothwell]

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

Hi all,

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

  fs/binfmt_flat.c

between commit:

  6071ecd874ac ("binfmt_flat: add endianess annotations")

from the m68knommu tree and commit:

  db543c385059 ("fs/binfmt_flat.c: remove set but not used variable 'inode'")

from the akpm-current tree.

I fixed it up (see below) 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

diff --cc fs/binfmt_flat.c
index 80d902fb46e3,7562d6aefbe4..000000000000
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@@ -429,9 -415,7 +429,8 @@@ static int load_flat_file(struct linux_
  	unsigned long textpos, datapos, realdatastart;
  	u32 text_len, data_len, bss_len, stack_len, full_data, flags;
  	unsigned long len, memp, memp_size, extra, rlim;
 -	u32 __user *reloc, *rp;
 +	__be32 __user *reloc;
 +	u32 __user *rp;
- 	struct inode *inode;
  	int i, rev, relocs;
  	loff_t fpos;
  	unsigned long start_code, end_code;

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

Re: linux-next: manual merge of the akpm-current tree with the m68knommu tree

[Christoph Hellwig]

On Fri, Jun 14, 2019 at 07:06:06PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   fs/binfmt_flat.c
> 
> between commit:
> 
>   6071ecd874ac ("binfmt_flat: add endianess annotations")
> 
> from the m68knommu tree and commit:
> 
>   db543c385059 ("fs/binfmt_flat.c: remove set but not used variable 'inode'")

Maybe this should better be added to the maintainer tree as well..

Re: linux-next: manual merge of the akpm-current tree with the m68knommu tree

[Stephen Rothwell]

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

Hi all,

On Fri, 14 Jun 2019 19:06:06 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   fs/binfmt_flat.c
> 
> between commit:
> 
>   6071ecd874ac ("binfmt_flat: add endianess annotations")
> 
> from the m68knommu tree and commit:
> 
>   db543c385059 ("fs/binfmt_flat.c: remove set but not used variable 'inode'")
> 
> from the akpm-current tree.
> 
> I fixed it up (see below) 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
> 
> diff --cc fs/binfmt_flat.c
> index 80d902fb46e3,7562d6aefbe4..000000000000
> --- a/fs/binfmt_flat.c
> +++ b/fs/binfmt_flat.c
> @@@ -429,9 -415,7 +429,8 @@@ static int load_flat_file(struct linux_
>   	unsigned long textpos, datapos, realdatastart;
>   	u32 text_len, data_len, bss_len, stack_len, full_data, flags;
>   	unsigned long len, memp, memp_size, extra, rlim;
>  -	u32 __user *reloc, *rp;
>  +	__be32 __user *reloc;
>  +	u32 __user *rp;
> - 	struct inode *inode;
>   	int i, rev, relocs;
>   	loff_t fpos;
>   	unsigned long start_code, end_code;

I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.

-- 
Cheers,
Stephen Rothwell

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