linux-kernel - linux-next: manual merge of the kbuild tree with the x86 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]

Date:	Tue, 9 Jun 2009 11:36:46 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Sam Ravnborg <sam@...nborg.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Mike Frysinger <vapier@...too.org>
Subject: linux-next: manual merge of the kbuild tree with the x86 tree

Hi Sam,

Today's linux-next merge of the kbuild tree got a conflict in
scripts/Makefile.lib between commit
d3dd3b5a29bb9582957451531fed461628dfc834 ("kbuild: allow compressors
(gzip, bzip2, lzma) to take multiple inputs") from the x86 tree and
commit c3434a63db85504449450625f229441c256b6f47 ("kbuild: fix spacing for
bzip2 commands") from the kbuild tree.

I used the version from the x86 tree which, as a side affect, fixed the
same spacing issue as the kbuild patch.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped