linux-kernel - linux-next: manual merge of the akpm tree with the kbuild 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: <20130704143353.e695ca64b17705c842676870@canb.auug.org.au>
Date:	Thu, 4 Jul 2013 14:33:53 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Yaakov Selkowitz <yselkowitz@...rs.sourceforge.net>,
	Michal Marek <mmarek@...e.cz>, Daniel Tang <dt.tangr@...il.com>
Subject: linux-next: manual merge of the akpm tree with the kbuild tree

Hi Andrew,

Today's linux-next merge of the akpm tree got conflicts in
tools/include/tools/be_byteshift.h and tools/include/tools/le_byteshift.h
between commit b35310627f39 ("tools/include: use stdint types for
user-space byteshift headers") from the kbuild tree and commit
"scripts/sortextable.c: fix building on non-Linux systems" from the
akpm tree.

As fas as I can tell, these patches do the same thing except one uses
stdint.h and the other inttypes.h.  I just dropped the akpm tree patch.

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

Content of type "application/pgp-signature" skipped