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>
Subject: Re: [GIT PULL] arm64 updates for 4.12
Date: Fri, 5 May 2017 12:38:32 -0700	[thread overview]
Message-ID: <CA+55aFxFoV_BUbQ=fUAWd2WxGRPe3K_eb7yfZYrh7oa6UOgOCA@mail.gmail.com> (raw)
In-Reply-To: <20170505161345.GA23336@e104818-lin.cambridge.arm.com>

On Fri, May 5, 2017 at 9:13 AM, Catalin Marinas <catalin.marinas@arm.com> wrote:
> diff --cc arch/arm64/include/asm/bug.h

Hmm. The trivial resolution I did gets a different diff as the end
result, but your diff looks different.

I think you used "-U2" to make for a smaller and more targeted context..

So I think the trivial resolution is what you meant. But I couldn't
test it, so I thought I'd mention this oddity.

               Linus

  reply	other threads:[~2017-05-05 19:38 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-05 16:13 [GIT PULL] arm64 updates for 4.12 Catalin Marinas
2017-05-05 19:38 ` Linus Torvalds [this message]
2017-05-05 20:16   ` 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+55aFxFoV_BUbQ=fUAWd2WxGRPe3K_eb7yfZYrh7oa6UOgOCA@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=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).