Hi Michael,
Today's linux-next merge of the vhost tree got conflicts in:
arch/ia64/include/asm/barrier.h
arch/powerpc/include/asm/barrier.h
arch/s390/include/asm/barrier.h
include/asm-generic/barrier.h
between commit:
d5a73cadf3fd ("lcoking/barriers, arch: Use smp barriers in
smp_store_release()")
from the tip tree and commit:
2683de3a1732 ("ia64: reuse asm-generic/barrier.h")
d78113bef3e0 ("powerpc: reuse asm-generic/barrier.h")
25bc870c914b ("s390: reuse asm-generic/barrier.h")
24888a057e97 ("asm-generic: add __smp_XXX wrappers")
from the vhost tree.
I fixed it up (in each case taking the vhost tree version) and can
carry the fix as necessary (no action is required).
However, given the ongoing review and discussion, I do wonder if these
vhost tree commits should be in linux-next yet.
--
Cheers,
Stephen Rothwell [email protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
