* linux-next: manual merge of the kbuild tree with the x86 tree
@ 2009-06-09 1:36 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2009-06-09 1:36 UTC (permalink / raw)
To: Sam Ravnborg
Cc: linux-next, linux-kernel, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Mike Frysinger
[-- Attachment #1: Type: text/plain, Size: 588 bytes --]
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-06-09 1:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-09 1:36 linux-next: manual merge of the kbuild tree with the x86 tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).