From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Linus Torvalds <torvalds@linux-foundation•org>
Cc: Will Deacon <will.deacon@arm•com>,
Jeremy Fitzhardinge <jeremy@goop•org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>,
Stefano Stabellini <stefano.stabellini@eu•citrix.com>,
Xen Devel <Xen-devel@lists•xensource.com>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
"linux-arm-kernel@lists•infradead.org"
<linux-arm-kernel@lists•infradead.org>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
David Vrabel <david.vrabel@citrix•com>,
Catalin Marinas <Catalin.Marinas@arm•com>,
Russell King <linux@arm•linux.org.uk>
Subject: Re: linux-next: missing merge fix patch for the merge of the xen-tip tree with the arm-soc tree
Date: Tue, 23 Dec 2014 17:32:34 +1100 [thread overview]
Message-ID: <20141223173234.7c4c45f5@canb.auug.org.au> (raw)
In-Reply-To: <CA+55aFwQKe0PvSuYqOeQMM8kouB3mkyQQ=gFMX=bkPx3GxanvA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 611 bytes --]
Hi Linus,
On Mon, 22 Dec 2014 20:09:50 -0800 Linus Torvalds <torvalds@linux-foundation•org> wrote:
>
> On Mon, Dec 22, 2014 at 6:26 PM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> > Hi Linus,
> >
> > I have been carrying this merge fix patch for some time that is now
> > needed in your tree:
>
> No, it's not. Look more closely.
>
> My merge put the
>
> dev->archdata.dma_coherent = coherent;
>
> line at the top of the function, like the way it was in the original commit.
Oops, sorry about that.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2014-12-23 6:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-08 7:49 linux-next: manual merge of the xen-tip tree with the arm-soc tree Stephen Rothwell
2014-12-08 10:33 ` Will Deacon
2014-12-23 2:26 ` linux-next: missing merge fix patch for the " Stephen Rothwell
2014-12-23 4:09 ` Linus Torvalds
2014-12-23 6:32 ` Stephen Rothwell [this message]
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=20141223173234.7c4c45f5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Catalin.Marinas@arm$(echo .)com \
--cc=Xen-devel@lists$(echo .)xensource.com \
--cc=arnd@arndb$(echo .)de \
--cc=david.vrabel@citrix$(echo .)com \
--cc=jeremy@goop$(echo .)org \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=olof@lixom$(echo .)net \
--cc=stefano.stabellini@eu$(echo .)citrix.com \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=will.deacon@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