From: Bjorn Andersson <bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
To: Vinod Koul <vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Peter Griffin
<peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
kernel-F5mvAk5X5gdBDgjK7y7TUQ@public.gmane.org,
ohad-Ix1uc/W3ht7QT0dZR+AlfA@public.gmane.org,
patrice.chotard-qxv4g6HH51o@public.gmane.org,
lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-remoteproc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH v10 01/11] remoteproc: st_slim_rproc: add a slimcore rproc driver
Date: Wed, 16 Nov 2016 22:36:46 -0800 [thread overview]
Message-ID: <20161117063646.GE28340@tuxbot> (raw)
In-Reply-To: <20161114051854.GW3000@localhost>
On Sun 13 Nov 21:18 PST 2016, Vinod Koul wrote:
> On Mon, Nov 07, 2016 at 01:57:35PM +0000, Peter Griffin wrote:
> > >
> > > As you now make changes to the entire remoteproc Kconfig file, rather
> > > than simply add a Kconfig symbol we can't bring this in via Vinod's tree
> > > without providing Linus with a messy merge conflict.
> > >
> > > So the remoteproc parts now has to go through my tree.
> >
> > OK, I think the best approach is for Vinod to create an immutable
> > branch with the entire fdma series on, and then both of you merge that branch into
> > your respective trees.
>
> my topic/st_fdma is immutable branch. You cna merge it, if you need a signed
> tag, please do let me know
>
Hi Vinod,
It looks like you reverted the wrong Kconfig fix, the one I objected to
was the change in drivers/remoteproc, not the one in drivers/dma.
The ST_FMDA depends on functions exposed by REMOTEPROC and
ST_SLIM_REMOTEPROC, the latter in turn depends on REMOTEPROC, which you
guys made user selectable - and as such should not be selected - but I
think we should move forward and get everything merged and then we can
go back and figure out how this should be addressed (or left alone?).
I have merged "topic/st_fdma" into rproc-next, so that I can fix up the
now broken drivers/remoteproc/Kconfig.
We do however both need to revert the revert or there will be link
errors if you build the dma driver with remoteproc=n. If you do this I
can merge the topic once more and we'll keep the set of changes in sync.
Regards,
Bjorn
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-11-17 6:36 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-18 9:39 [RESEND PATCH v10 00/11] Add support for FDMA DMA controller and slim core rproc found on STi chipsets Peter Griffin
[not found] ` <1476783556-2501-1-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-10-18 9:39 ` [PATCH v10 01/11] remoteproc: st_slim_rproc: add a slimcore rproc driver Peter Griffin
[not found] ` <1476783556-2501-2-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-11-03 21:37 ` Bjorn Andersson
2016-11-07 13:57 ` Peter Griffin
2016-11-14 5:18 ` Vinod Koul
2016-11-14 11:42 ` Peter Griffin
2016-11-16 3:32 ` Vinod Koul
2016-11-17 6:36 ` Bjorn Andersson [this message]
2016-11-17 9:52 ` Vinod Koul
2016-11-18 16:40 ` Bjorn Andersson
2016-10-18 9:39 ` [PATCH v10 03/11] remoteproc: Update Kconfig setup to 'depends on REMOTEPROC' Peter Griffin
2016-10-18 9:39 ` [PATCH v10 04/11] dmaengine: st_fdma: Add STMicroelectronics FDMA DT binding documentation Peter Griffin
2016-10-18 9:39 ` [PATCH v10 06/11] dmaengine: st_fdma: Add STMicroelectronics FDMA engine driver support Peter Griffin
2016-10-18 9:39 ` [PATCH v10 08/11] ARM: multi_v7_defconfig: Enable remoteproc core Peter Griffin
2016-10-18 9:39 ` [PATCH v10 10/11] ARM: multi_v7_defconfig: Enable STi FDMA driver Peter Griffin
2016-10-18 9:39 ` [PATCH v10 02/11] MAINTAINERS: Add st slim core rproc driver to STi section Peter Griffin
2016-10-18 9:39 ` [PATCH v10 05/11] dmaengine: st_fdma: Add STMicroelectronics FDMA driver header file Peter Griffin
2016-10-18 9:39 ` [PATCH v10 07/11] MAINTAINERS: Add FDMA driver files to STi section Peter Griffin
2016-10-18 9:39 ` [PATCH v10 09/11] ARM: multi_v7_defconfig: Enable st_remoteproc driver Peter Griffin
2016-10-18 9:39 ` [PATCH v10 11/11] ARM: multi_v7_defconfig: Enable STi and simple-card drivers Peter Griffin
[not found] ` <1476783556-2501-12-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-10-18 10:21 ` Mark Brown
2016-10-18 14:43 ` [RESEND PATCH v10 00/11] Add support for FDMA DMA controller and slim core rproc found on STi chipsets Vinod Koul
-- strict thread matches above, loose matches on Subject: below --
2016-10-08 12:52 [PATCH " Peter Griffin
2016-10-08 12:52 ` [PATCH v10 01/11] remoteproc: st_slim_rproc: add a slimcore rproc driver Peter Griffin
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=20161117063646.GE28340@tuxbot \
--to=bjorn.andersson-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=kernel-F5mvAk5X5gdBDgjK7y7TUQ@public.gmane.org \
--cc=lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-remoteproc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=ohad-Ix1uc/W3ht7QT0dZR+AlfA@public.gmane.org \
--cc=patrice.chotard-qxv4g6HH51o@public.gmane.org \
--cc=peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=vinod.koul-ral2JQCrhuEAvxtiuMwx3w@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).