Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in scripts/checkpatch.pl between commit 8678fa326053d41 ("checkpatch: relax check for length of git commit IDs") from Linus' tree and what looks like the same commit from the akpm-current tree.
I fixed it up by taking Linus' version and can carry as required.
Thanks,
Mark
Attachment:
pgp2Iv5s0F_9_.pgp
Description: PGP signature
