From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Renesas ARM64 Based SoC Defconfig Updates for v4.6
Date: Tue, 1 Mar 2016 18:15:08 +0900 [thread overview]
Message-ID: <20160301091506.GA4363@verge.net.au> (raw)
In-Reply-To: <2850636.ecdOjeBnf0@wuerfel>
On Mon, Feb 29, 2016 at 04:18:37PM +0100, Arnd Bergmann wrote:
> On Friday 26 February 2016 08:51:45 Simon Horman wrote:
> > Please consider these Renesas ARM64 based SoC defconfig updates for v4.6.
> >
> > This pull request is based on the previous round of
> > such requests, tagged as v4.5-rc2,
> > which I have already sent a pull-request for.
>
> It looks like your script generated a funny text here, as you
> did not send -rc2 ;-)
Oops, I'll have to teach my script to be a bit smarter.
> > I based this pull request on v4.5-rc2 instead of rc1 to avoid
> > a minor conflict. However I believe this may have been in vein
> > as there appears to be a separate minor conflict present in linux-next.
>
> Doesn't really matter here, the trivial conflicts are never a
> problem, and the branches are already based on -rc3, so you are
> not introducing a backmerge.
>
> Pulled into next/arm64, thanks!
>
> Arnd
prev parent reply other threads:[~2016-03-01 9:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 23:51 [GIT PULL] Renesas ARM64 Based SoC Defconfig Updates for v4.6 Simon Horman
2016-02-25 23:51 ` [PATCH] arm64: defconfig: Add Renesas R-Car Gen3 USB 2.0 phy driver support Simon Horman
2016-02-29 15:18 ` [GIT PULL] Renesas ARM64 Based SoC Defconfig Updates for v4.6 Arnd Bergmann
2016-03-01 9:15 ` Simon Horman [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=20160301091506.GA4363@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
/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).