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

lists.openwall.net		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 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20140901235416.5181ece8487f3365511bbf93@kernel.org>
Date:	Mon, 1 Sep 2014 23:54:16 +0100
From:	Mark Brown <broonie@...nel.org>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the akpm-current tree with the  tree

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

Content of type "application/pgp-signature" skipped