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..
