From: Andy Gross <agross@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Subject: Re: linux-next: manual merge of the qcom tree with the arm-soc tree
Date: Mon, 12 Oct 2015 11:29:13 -0500 [thread overview]
Message-ID: <20151012162913.GA31761@qualcomm.com> (raw)
In-Reply-To: <20151012101912.33e77590@canb.auug.org.au>
On Mon, Oct 12, 2015 at 10:19:12AM +1100, Stephen Rothwell wrote:
> Hi Andy,
>
> Today's linux-next merge of the qcom tree got a conflict in:
>
> arch/arm/configs/multi_v7_defconfig
>
> between commits:
>
> b605aded4491 ("ARM: multi_v7_defconfig: Add missing QCOM APQ8064 configs")
> cc68819a582c ("ARM: multi_v7_defconfig: Enable Rockchip display support")
>
> from the arm-soc tree and commit:
>
> 4e7fb93081f8 ("ARM: multi_v7_defconfig: Enable QCOM SMD/RPM")
>
> from the qcom tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
Thanks. I'll redo that patch based on arm-soc's next before sending the pull
request. multi_v7 defconfig changes are always a barrel o' fun
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
WARNING: multiple messages have this Message-ID (diff)
From: agross@codeaurora.org (Andy Gross)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the qcom tree with the arm-soc tree
Date: Mon, 12 Oct 2015 11:29:13 -0500 [thread overview]
Message-ID: <20151012162913.GA31761@qualcomm.com> (raw)
In-Reply-To: <20151012101912.33e77590@canb.auug.org.au>
On Mon, Oct 12, 2015 at 10:19:12AM +1100, Stephen Rothwell wrote:
> Hi Andy,
>
> Today's linux-next merge of the qcom tree got a conflict in:
>
> arch/arm/configs/multi_v7_defconfig
>
> between commits:
>
> b605aded4491 ("ARM: multi_v7_defconfig: Add missing QCOM APQ8064 configs")
> cc68819a582c ("ARM: multi_v7_defconfig: Enable Rockchip display support")
>
> from the arm-soc tree and commit:
>
> 4e7fb93081f8 ("ARM: multi_v7_defconfig: Enable QCOM SMD/RPM")
>
> from the qcom tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
Thanks. I'll redo that patch based on arm-soc's next before sending the pull
request. multi_v7 defconfig changes are always a barrel o' fun
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2015-10-12 16:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-11 23:19 linux-next: manual merge of the qcom tree with the arm-soc tree Stephen Rothwell
2015-10-11 23:19 ` Stephen Rothwell
2015-10-11 23:19 ` Stephen Rothwell
2015-10-12 16:29 ` Andy Gross [this message]
2015-10-12 16:29 ` Andy Gross
-- strict thread matches above, loose matches on Subject: below --
2019-11-04 22:39 Stephen Rothwell
2019-11-04 22:39 ` Stephen Rothwell
2023-12-03 23:03 Stephen Rothwell
2023-12-03 23:03 ` Stephen Rothwell
2023-12-03 23:08 Stephen Rothwell
2023-12-03 23:08 ` Stephen Rothwell
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=20151012162913.GA31761@qualcomm.com \
--to=agross@codeaurora.org \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=sjoerd.simons@collabora.co.uk \
--cc=srinivas.kandagatla@linaro.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 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.