linux-kernel - linux-next: bad merge in the moduleh 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120306105749.4eb0fcccacfe9352e8042f06@canb.auug.org.au>
Date:	Tue, 6 Mar 2012 10:57:49 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: bad merge in the moduleh tree

Hi Paul,

I noticed this merge in the moduleh tree:

dc69707e944e "Merge branch 'module-3.4' into for-sfr"

This merge result in multplie includes of kernel.h in lib/average.c and
lib/list_debug.c.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped