public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christoffer Dall <cdall@cs•columbia.edu>
Cc: Marc Zyngier <marc.zyngier@arm•com>,
	Christoffer Dall <christofferdall@christofferdall•dk>,
	"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
	linux-kernel <linux-kernel@vger•kernel.org>,
	Will Deacon <Will.Deacon@arm•com>
Subject: Re: linux-next: manual merge of the kvm-arm tree with Linus' tree
Date: Fri, 1 Aug 2014 15:21:41 +1000	[thread overview]
Message-ID: <20140801152141.15d028c1@canb.auug.org.au> (raw)
In-Reply-To: <20140731142347.GB589@cbox>

[-- Attachment #1: Type: text/plain, Size: 434 bytes --]

Hi Christoffer,

On Thu, 31 Jul 2014 16:23:47 +0200 Christoffer Dall <cdall@cs•columbia.edu> wrote:
>
> Stephen, did you pick up the resolution provided by Marc for the gicv2
> fix patch so that it applies to tomorrow's next/kvmarm merge?

Yes, I have.  You will need to produce the same for Linus eventually,
or do the merge yourself as I suggested.

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

  parent reply	other threads:[~2014-08-01  5:21 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-31  6:30 linux-next: manual merge of the kvm-arm tree with Linus' tree Stephen Rothwell
2014-07-31 12:10 ` Marc Zyngier
     [not found] ` <CAEDV+gJ1oSPzgZMO=kdFDNPnzy-EOHGuLxHqTB8KO6d_8yPrxQ@mail.gmail.com>
2014-07-31 12:15   ` Marc Zyngier
2014-07-31 14:23     ` Christoffer Dall
2014-07-31 14:30       ` Marc Zyngier
2014-08-01  5:21       ` Stephen Rothwell [this message]
2014-07-31 12:17   ` Stephen Rothwell
2014-07-31 12:41     ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2014-10-17  1:47 Stephen Rothwell
2015-03-18  3:41 Stephen Rothwell
2015-03-18  7:55 ` Christoffer Dall
2015-04-07 16:20   ` Paolo Bonzini
2015-04-08  8:15     ` Marc Zyngier
2015-04-08 10:57       ` Christoffer Dall
2015-04-16 19:10     ` Christoffer Dall
2015-04-16 19:39       ` Paolo Bonzini
2015-04-16 20:16         ` Christoffer Dall
2017-04-10  4:02 Stephen Rothwell
2017-04-10  8:02 ` Christoffer Dall
2017-11-06  2:52 Stephen Rothwell
2017-11-06  2:56 Stephen Rothwell
2018-01-03  2:38 Stephen Rothwell
2018-01-03  9:50 ` Christoffer Dall
2025-03-05  4:34 Stephen Rothwell
2025-11-13  0:37 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=20140801152141.15d028c1@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=Will.Deacon@arm$(echo .)com \
    --cc=cdall@cs$(echo .)columbia.edu \
    --cc=christofferdall@christofferdall$(echo .)dk \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=marc.zyngier@arm$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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