From: Olof Johansson <olof@lixom.net>
To: Krzysztof Kozlowski <krzk@kernel.org>
Cc: "linux-samsung-soc@vger.kernel.org"
<linux-samsung-soc@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
linux-kernel@vger.kernel.org, arm@kernel.org,
Kukjin Kim <kgene@kernel.org>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL 1/4] ARM: defconfig: Samsung/Exynos for v5.3
Date: Wed, 26 Jun 2019 19:28:42 -0700 [thread overview]
Message-ID: <20190627022842.k4gccn6enqd75ufs@localhost> (raw)
In-Reply-To: <CAJKOXPeCQZPsF1kGKmhSWgxsWSsb4cre6mhS=n=kJbH63LjmUQ@mail.gmail.com>
On Wed, Jun 26, 2019 at 11:14:04AM +0200, Krzysztof Kozlowski wrote:
> On Tue, 25 Jun 2019 at 21:35, Krzysztof Kozlowski <krzk@kernel.org> wrote:
> >
> > The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:
> >
> > Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)
> >
> > are available in the Git repository at:
> >
> > https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-defconfig-5.3
> >
> > for you to fetch changes up to dd50a69b5697532666023766688c6ea642e5a443:
> >
> > ARM: exynos_defconfig: Enable Panfrost and Lima drivers (2019-06-19 19:23:35 +0200)
> >
> > ----------------------------------------------------------------
> > Samsung defconfig changes for v5.3
> >
> > 1. Trim several configs with savedefconfig.
> > 2. Enable Lima and Panfrost drivers for Mali GPU.
>
> Hi,
>
> I forgot to mention possible merge conflicts (although Stephen Cc-ed
> you on mails). Resolution is to accept both sides:
>
Some of this could have been avoided by basing your branch on our fixes, but
not a big deal in this case. Thanks for the heads up!
-Olof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-06-27 5:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 19:34 [GIT PULL 1/4] ARM: defconfig: Samsung/Exynos for v5.3 Krzysztof Kozlowski
2019-06-25 19:34 ` [GIT PULL 2/4] ARM: dts: exynos: Second pull " Krzysztof Kozlowski
2019-06-27 2:23 ` Olof Johansson
2019-06-25 19:34 ` [GIT PULL 3/4] arm64: dts: exynos: Pull " Krzysztof Kozlowski
2019-06-27 2:24 ` Olof Johansson
2019-06-25 19:34 ` [GIT PULL 4/4] ARM: exynos: Mach " Krzysztof Kozlowski
2019-06-26 9:15 ` Krzysztof Kozlowski
2019-06-27 2:30 ` Olof Johansson
2019-06-26 9:14 ` [GIT PULL 1/4] ARM: defconfig: Samsung/Exynos " Krzysztof Kozlowski
2019-06-27 2:28 ` Olof Johansson [this message]
2019-06-27 2:27 ` Olof Johansson
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=20190627022842.k4gccn6enqd75ufs@localhost \
--to=olof@lixom.net \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=kgene@kernel.org \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.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).