Re: linux-next: manual merge of the akpm tree with the tip tree
From: Andrew Morton
Date: Wed Feb 13 2019 - 14:59:10 EST
On Wed, 13 Feb 2019 17:49:28 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
> Today's linux-next merge of the akpm tree got a conflict in:
> between commit:
> 4ad119545d78 ("locking/atomics: Check atomic headers with sha1sum")
> from the tip tree and patch:
> "scripts/atomic/check-atomics.sh: don't assume that scripts are executable"
> from the akpm tree.
> I fixed it up (this latter patch is now needed against the new
> scripts/atomic/gen-atomics.sh instead) and can carry the fix as
Thanks. I don't know why I've been carrying that fix for so long :(