From: Marc Zyngier <marc.zyngier@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoffer Dall <cdall@cs.columbia.edu>,
"linux-next\@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel\@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Will Deacon <Will.Deacon@arm.com>
Subject: Re: linux-next: manual merge of the kvm-arm tree with the kvm tree
Date: Thu, 18 Sep 2014 16:13:09 +0100 [thread overview]
Message-ID: <86zjdxuflm.fsf@arm.com> (raw)
In-Reply-To: <20140918135226.0526f91f@canb.auug.org.au> (Stephen Rothwell's message of "Thu, 18 Sep 2014 04:52:26 +0100")
On Thu, Sep 18 2014 at 04:52:26 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-arm tree got a conflict in
> virt/kvm/arm/vgic.c between commit c06a841bf363 ("KVM: ARM: vgic:
> register kvm_device_ops dynamically") from the kvm tree and commit
> de56fb1923ca ("KVM: vgic: declare probe function pointer as const")
> from the kvm-arm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks Stephen.
M.
--
Jazz is not dead. It just smells funny.
WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <marc.zyngier@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoffer Dall <cdall@cs.columbia.edu>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Will Deacon <Will.Deacon@arm.com>
Subject: Re: linux-next: manual merge of the kvm-arm tree with the kvm tree
Date: Thu, 18 Sep 2014 16:13:09 +0100 [thread overview]
Message-ID: <86zjdxuflm.fsf@arm.com> (raw)
In-Reply-To: <20140918135226.0526f91f@canb.auug.org.au> (Stephen Rothwell's message of "Thu, 18 Sep 2014 04:52:26 +0100")
On Thu, Sep 18 2014 at 04:52:26 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-arm tree got a conflict in
> virt/kvm/arm/vgic.c between commit c06a841bf363 ("KVM: ARM: vgic:
> register kvm_device_ops dynamically") from the kvm tree and commit
> de56fb1923ca ("KVM: vgic: declare probe function pointer as const")
> from the kvm-arm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks Stephen.
M.
--
Jazz is not dead. It just smells funny.
next prev parent reply other threads:[~2014-09-18 15:13 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-18 3:52 linux-next: manual merge of the kvm-arm tree with the kvm tree Stephen Rothwell
2014-09-18 15:13 ` Marc Zyngier [this message]
2014-09-18 15:13 ` Marc Zyngier
-- strict thread matches above, loose matches on Subject: below --
2023-04-06 3:06 Stephen Rothwell
2023-03-31 2:26 Stephen Rothwell
2022-12-01 2:16 Stephen Rothwell
2022-12-01 15:23 ` Marc Zyngier
2022-12-01 1:09 Stephen Rothwell
2022-12-01 0:57 Stephen Rothwell
2022-12-01 0:36 Stephen Rothwell
2022-12-01 0:24 Stephen Rothwell
2022-07-18 5:19 Stephen Rothwell
2022-05-05 4:47 Stephen Rothwell
2021-12-17 4:19 Stephen Rothwell
2021-12-09 22:01 broonie
2021-06-25 5:24 Stephen Rothwell
2021-06-25 5:20 Stephen Rothwell
2021-06-25 5:15 Stephen Rothwell
2021-06-23 5:53 Stephen Rothwell
2021-06-22 5:31 Stephen Rothwell
2021-04-22 4:43 Stephen Rothwell
2021-04-22 4:39 Stephen Rothwell
2020-07-13 4:40 Stephen Rothwell
2020-08-09 8:55 ` Stephen Rothwell
2020-07-13 4:39 Stephen Rothwell
2020-08-09 8:54 ` Stephen Rothwell
2020-03-25 3:23 Stephen Rothwell
2018-10-18 2:46 Stephen Rothwell
2017-04-10 3:52 Stephen Rothwell
2017-04-10 6:26 ` Christoffer Dall
2016-07-24 6:04 Stephen Rothwell
2016-07-24 6:04 ` Stephen Rothwell
2016-07-24 5:59 Stephen Rothwell
2016-07-24 5:59 ` Stephen Rothwell
2016-07-20 5:27 Stephen Rothwell
2016-07-20 5:27 ` Stephen Rothwell
2015-10-16 3:53 Stephen Rothwell
2015-10-16 3:53 ` Stephen Rothwell
2015-10-16 4:20 ` Wu, Feng
2014-11-26 6:19 Stephen Rothwell
2014-11-26 11:39 ` Christoffer Dall
2014-09-25 5:32 Stephen Rothwell
2014-09-08 6:04 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=86zjdxuflm.fsf@arm.com \
--to=marc.zyngier@arm.com \
--cc=Will.Deacon@arm.com \
--cc=cdall@cs.columbia.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.