From: Tony Lindgren <tony@atomide.com>
To: Olof Johansson <olof@lixom.net>
Cc: linux-omap@vger.kernel.org, arm@kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL 5/5] dts changes for omap mcan for v4.19
Date: Mon, 16 Jul 2018 00:53:46 -0700 [thread overview]
Message-ID: <20180716075346.GS99251@atomide.com> (raw)
In-Reply-To: <20180714211925.btxeb3ewlohndsiz@localhost>
* Olof Johansson <olof@lixom.net> [180714 22:21]:
> On Wed, Jul 11, 2018 at 06:19:08AM -0700, Tony Lindgren wrote:
> > dts changes for mcan for omaps for v4.19 merge window
> >
> > These changes configure the mcan clock, interconnect target
> > module and mcan device. These changes depend on the ti-sysc
> > related driver changes and are based on those.
> >
> > Notably this is the first new driver that probes with ti-sysc
> > driver with no legacy hwmod platform data for the interconnect
> > target module.
>
> Hi Tony,
>
> I'm not entirely sure why you sent this as a separate pull request, but it also
> conflicts with your first DT branch (add/add conflict at the end of the file).
I put them into a separate branch because they were based on
the pending ti-sysc driver changes so you could merge them to
a branch you prefer. But I forgot the merge conflict again..
The resolution is almost always in Linux next for the branches
I send pull requests for for. But I added some notes to check
those next time.
> Fixed up by keeping both sides, merged.
OK thanks!
Tony
next prev parent reply other threads:[~2018-07-16 7:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-11 13:19 [GIT PULL 1/5] omap1 soc changes for v4.19 Tony Lindgren
2018-07-11 13:19 ` [GIT PULL 2/5] soc changes for omaps " Tony Lindgren
2018-07-14 21:45 ` Olof Johansson
2018-07-11 13:19 ` [GIT PULL 3/5] ti-sysc driver " Tony Lindgren
2018-07-14 21:39 ` Olof Johansson
2018-07-11 13:19 ` [GIT PULL 4/5] dts " Tony Lindgren
2018-07-14 21:17 ` Olof Johansson
2018-07-11 13:19 ` [GIT PULL 5/5] dts changes for omap mcan " Tony Lindgren
2018-07-14 21:19 ` Olof Johansson
2018-07-16 7:53 ` Tony Lindgren [this message]
2018-07-14 21:44 ` [GIT PULL 1/5] omap1 soc changes " 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=20180716075346.GS99251@atomide.com \
--to=tony@atomide.com \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=olof@lixom.net \
/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).