From: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
Cc: arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>,
Alexandre Courbot
<gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Subject: Re: [GIT PULL 7/8] ARM: tegra: Devicetree changes for v4.2-rc1
Date: Fri, 15 May 2015 12:43:34 +0200 [thread overview]
Message-ID: <20150515104332.GB20474@ulmo.nvidia.com> (raw)
In-Reply-To: <3095273.etWfHSyyvC@wuerfel>
[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]
On Wed, May 13, 2015 at 06:09:20PM +0200, Arnd Bergmann wrote:
> On Wednesday 13 May 2015 15:49:39 Thierry Reding wrote:
> > ARM: tegra: Devicetree changes for v4.2-rc1
> >
> > Contains a couple of fixes and additions to device tree files. The most
> > notable change is a fix for a misapplied patch that was only exposed by
> > a recent change in the regulator subsystem that caused USB to break on
> > Tegra124 recently.
>
> It sounds like I should merge commit a4b6916cb35 ("ARM: tegra: Correct
> which USB controller has the UTMI pad registers") into the 4.1 fixes
> branch as well. Please confirm.
I think you already did. I sent out a pull request for that not very
long ago and I must have forgotten to drop this patch from the Tegra
tree after it got applied to arm-soc. The merge commit for this in
the fixes branch is here:
https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/commit/?h=fixes&id=155171274d1dd9d9e5a012bd912c592402aa31d2
Hopefully git will be able to merge these together without conflicts.
Sorry about the dupe.
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-05-15 10:43 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-13 13:49 [GIT PULL 0/8] ARM: tegra: Changes for v4.2-rc1 Thierry Reding
[not found] ` <1431524980-13599-1-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-05-13 13:49 ` [GIT PULL 1/8] ARM: tegra: Cleanup patches " Thierry Reding
[not found] ` <1431524980-13599-2-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-05-13 15:54 ` Arnd Bergmann
2015-05-13 13:49 ` [GIT PULL 2/8] ARM: tegra: Memory controller updates " Thierry Reding
[not found] ` <1431524980-13599-3-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-05-13 15:55 ` Arnd Bergmann
2015-05-13 13:49 ` [GIT PULL 3/8] ARM: tegra: RAM code access " Thierry Reding
[not found] ` <1431524980-13599-4-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-05-13 15:58 ` Arnd Bergmann
2015-05-13 13:49 ` [GIT PULL 4/8] clk: tegra: Changes " Thierry Reding
[not found] ` <1431524980-13599-5-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-05-20 19:54 ` Stephen Boyd
[not found] ` <20150520195459.GU31753-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2015-05-21 6:25 ` Mikko Perttunen
[not found] ` <555D7A5B.1070901-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2015-05-27 14:59 ` Mikko Perttunen
2015-05-27 19:50 ` Stephen Boyd
[not found] ` <20150527195021.GA24204-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2015-05-28 7:03 ` Mikko Perttunen
[not found] ` <5566BDA5.5080104-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2015-06-18 23:41 ` Michael Turquette
2015-06-20 20:41 ` Michael Turquette
2015-06-22 6:59 ` Mikko Perttunen
[not found] ` <5587B243.2070300-/1wQRMveznE@public.gmane.org>
2015-06-22 7:03 ` Mikko Perttunen
2015-06-29 8:54 ` Thierry Reding
2015-05-28 10:13 ` Peter De Schrijver
2015-05-13 13:49 ` [GIT PULL 5/8] ARM: tegra: Add EMC driver " Thierry Reding
[not found] ` <1431524980-13599-6-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-05-13 16:00 ` Arnd Bergmann
2015-05-13 13:49 ` [GIT PULL 6/8] ARM: tegra: Core SoC changes " Thierry Reding
[not found] ` <1431524980-13599-7-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-05-13 16:02 ` Arnd Bergmann
2015-05-13 13:49 ` [GIT PULL 7/8] ARM: tegra: Devicetree " Thierry Reding
[not found] ` <1431524980-13599-8-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-05-13 16:09 ` Arnd Bergmann
2015-05-15 10:43 ` Thierry Reding [this message]
[not found] ` <20150515104332.GB20474-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>
2015-05-15 11:06 ` Arnd Bergmann
2015-05-13 13:49 ` [GIT PULL 8/8] ARM: tegra: Default configuration updates " Thierry Reding
[not found] ` <1431524980-13599-9-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-05-13 16:12 ` Arnd Bergmann
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=20150515104332.GB20474@ulmo.nvidia.com \
--to=thierry.reding-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=arnd-r2nGTMty4D4@public.gmane.org \
--cc=gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.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).