Hi all,

Today's linux-next merge of the powerpc got a conflict in
include/asm-powerpc/mmu-44x.h between commit
dbc0b98a9feb95a65275d9937d815a3bd4300103 ("ppc: Export tlb_44x_hwater for
KVM") in the kvm tree and commit d04ceb3fc294ea2c4f538a04343f3a473953a3b0
("[POWERPC] Move phys_addr_t definition into asm/types.h") in the powerpc
tree.  The fixup was trivial.

-- 
Cheers,
Stephen Rothwell                    [EMAIL PROTECTED]
http://www.canb.auug.org.au/~sfr/

Attachment: pgpmpBvDxzCKg.pgp
Description: PGP signature

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Reply via email to