From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Marcelo Tosatti <mtosatti@redhat.com>,
Gleb Natapov <gleb@kernel.org>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Pranith Kumar <bobby.prani@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: linux-next: manual merge of the kvm tree with the rcu tree
Date: Mon, 8 Dec 2014 18:28:48 +1100 [thread overview]
Message-ID: <20141208182848.176cabf3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 443 bytes --]
Hi all,
Today's linux-next merge of the kvm tree got a conflict in
arch/ia64/kvm/Kconfig between commit d80bd9c0e85f ("tinification: Make
SRCU optional by using CONFIG_SRCU") from the rcu tree and commit
003f7de62589 ("KVM: ia64: remove") from the kvm tree.
I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-12-08 7:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-08 7:28 Stephen Rothwell [this message]
2020-04-22 3:52 linux-next: manual merge of the kvm tree with the rcu tree Stephen Rothwell
2020-05-18 5:42 Stephen Rothwell
2020-05-18 5:46 ` Stephen Rothwell
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=20141208182848.176cabf3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bobby.prani@gmail.com \
--cc=gleb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=pbonzini@redhat.com \
/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;
as well as URLs for NNTP newsgroup(s).