lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  PHC 
Open Source and information security mailing list archives
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Fri, 14 Jun 2019 11:32:18 +0200
From:   Christoph Hellwig <>
To:     Stephen Rothwell <>
Cc:     Andrew Morton <>,
        Greg Ungerer <>,
        Linux Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Christoph Hellwig <>,
        YueHaibing <>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 m68knommu tree

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

Powered by blists - more mailing lists