From: Thierry Reding <treding@nvidia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Stephen Warren <swarren@nvidia.com>,
Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
Simon Horman <horms@verge.net.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Magnus Damm <damm+renesas@opensource.se>
Subject: Re: linux-next: manual merge of the tegra tree with the renesas tree
Date: Wed, 18 Nov 2015 15:22:58 +0100 [thread overview]
Message-ID: <20151118142257.GA32301@ulmo.nvidia.com> (raw)
In-Reply-To: <20151118101512.0691d12f@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 640 bytes --]
On Wed, Nov 18, 2015 at 10:15:12AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tegra tree got a conflict in:
>
> arch/arm64/configs/defconfig
>
> between commit:
>
> 727e8d0126e3 ("arm64: defconfig: renesas: Enable Renesas r8a7795 SoC")
>
> from the renesas tree and commit:
>
> 0a31289369f8 ("arm64: defconfig: Enable serial-tegra driver")
>
> from the tegra tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
Looks good, thanks.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Thierry Reding <treding@nvidia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Stephen Warren <swarren@nvidia.com>,
Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
Simon Horman <horms@verge.net.au>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Magnus Damm <damm+renesas@opensource.se>
Subject: Re: linux-next: manual merge of the tegra tree with the renesas tree
Date: Wed, 18 Nov 2015 15:22:58 +0100 [thread overview]
Message-ID: <20151118142257.GA32301@ulmo.nvidia.com> (raw)
In-Reply-To: <20151118101512.0691d12f@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 640 bytes --]
On Wed, Nov 18, 2015 at 10:15:12AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tegra tree got a conflict in:
>
> arch/arm64/configs/defconfig
>
> between commit:
>
> 727e8d0126e3 ("arm64: defconfig: renesas: Enable Renesas r8a7795 SoC")
>
> from the renesas tree and commit:
>
> 0a31289369f8 ("arm64: defconfig: Enable serial-tegra driver")
>
> from the tegra tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
Looks good, thanks.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-11-18 14:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-17 23:15 linux-next: manual merge of the tegra tree with the renesas tree Stephen Rothwell
2015-11-18 14:22 ` Thierry Reding [this message]
2015-11-18 14:22 ` Thierry Reding
2015-11-18 16:04 ` Simon Horman
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=20151118142257.GA32301@ulmo.nvidia.com \
--to=treding@nvidia.com \
--cc=ccross@android.com \
--cc=damm+renesas@opensource.se \
--cc=horms@verge.net.au \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=swarren@nvidia.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.