linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>,
	"linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Andrew Lutomirski <luto@kernel.org>,
	Marc Zyngier <marc.zyngier@arm.com>
Subject: Re: [GIT PULL] arm64 updates for 4.10
Date: Tue, 13 Dec 2016 16:58:33 -0800	[thread overview]
Message-ID: <CA+55aFxxJy_xkGva8uX8LeFaBgb48mRpO05sJdGveBvRnK0uvg@mail.gmail.com> (raw)
In-Reply-To: <20161213192156.GA12471@e104818-lin.cambridge.arm.com>

On Tue, Dec 13, 2016 at 11:21 AM, Catalin Marinas
<catalin.marinas@arm.com> wrote:
>
> Please pull the arm64 updates for 4.10 below.

Mind checking that I got the conflict resolution right?

The conflict looked completely trivial, but with stuff moving across
files and since I don't build the end result (much less boot it) I
could easily have missed some screw-up of mine.

Thanks,

                 Linus

  parent reply	other threads:[~2016-12-14  0:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-13 19:21 [GIT PULL] arm64 updates for 4.10 Catalin Marinas
2016-12-13 23:21 ` Stephen Rothwell
2016-12-14  0:58 ` Linus Torvalds [this message]
2016-12-14 12:21   ` Catalin Marinas

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=CA+55aFxxJy_xkGva8uX8LeFaBgb48mRpO05sJdGveBvRnK0uvg@mail.gmail.com \
    --to=torvalds@linux-foundation.org \
    --cc=catalin.marinas@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=will.deacon@arm.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).