From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Davidlohr Bueso <dave@stgolabs.net>
Subject: linux-next: manual merge of the vhost tree with the tip tree
Date: Thu, 31 Dec 2015 20:23:47 +1100 [thread overview]
Message-ID: <20151231202347.3090c74b@canb.auug.org.au> (raw)
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 sfr@canb.auug.org.au
next reply other threads:[~2015-12-31 9:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-31 9:23 Stephen Rothwell [this message]
2015-12-31 10:25 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151231202347.3090c74b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dave@stgolabs.net \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mst@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®