* linux-next: powerpc tree merge conflict
@ 2008-03-05 7:40 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2008-03-05 7:40 UTC (permalink / raw)
To: Paul Mackerras, linuxppc-dev; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 467 bytes --]
Hi Paul,
There was a small conflict with Linus' tree (in arch/powerpc/Kconfig) in
merging the powerpc next branch into today's linux-next tree. Commit
d9b2b2a277219d4812311d995054ce4f95067725 ('[LIB]: Make PowerPC LMB code
generic so sparc64 can use it too') conflicted with
9edddaa200df18e08fe0cf21036e8ae467b1363c ('Kprobes: indicate kretprobe
support in Kconfig'). I fixed it up.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-03-05 7:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-05 7:40 linux-next: powerpc tree merge conflict Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox