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 [EMAIL PROTECTED]
pgp2luKptXiR8.pgp
Description: PGP signature
_______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
