From: Vinod Koul <vinod.koul@intel.com>
To: Peter Griffin <peter.griffin@linaro.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kernel@stlinux.com,
ohad@wizery.com, patrice.chotard@st.com, lee.jones@linaro.org,
dmaengine@vger.kernel.org, devicetree@vger.kernel.org,
linux-remoteproc@vger.kernel.org
Subject: Re: [PATCH v10 01/11] remoteproc: st_slim_rproc: add a slimcore rproc driver
Date: Wed, 16 Nov 2016 09:02:06 +0530 [thread overview]
Message-ID: <20161116033206.GX3000@localhost> (raw)
In-Reply-To: <20161114114216.GA8986@griffinp-ThinkPad-X1-Carbon-2nd>
On Mon, Nov 14, 2016 at 11:42:16AM +0000, Peter Griffin wrote:
> Hi Vinod,
>
> On Mon, 14 Nov 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
>
> OK.
>
> >
> > >
> > > That way there won't be any conflicts and you can both accept further changes
> > > for v4.9 release. Trying to take half the series via rproc, and half via dma trees won't work
> > > because they have dependencies on each other.
> > >
> > > I will send a v11 series in a moment which includes the feedback in this email
> > > and also include the additional fixes which Vinod has applied since the driver
> > > has been in linux-next.
> >
> > WHY.. Stuff is already merged twice!
>
> When the feedback is "there is an unrelated change in this patch", the only way
> you can fix that is by having a new version of the patch.
It can be reverted and clean patch applied..
--
~Vinod
WARNING: multiple messages have this Message-ID (diff)
From: Vinod Koul <vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
To: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: Bjorn Andersson
<bjorn.andersson-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 09:02:06 +0530 [thread overview]
Message-ID: <20161116033206.GX3000@localhost> (raw)
In-Reply-To: <20161114114216.GA8986@griffinp-ThinkPad-X1-Carbon-2nd>
On Mon, Nov 14, 2016 at 11:42:16AM +0000, Peter Griffin wrote:
> Hi Vinod,
>
> On Mon, 14 Nov 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
>
> OK.
>
> >
> > >
> > > That way there won't be any conflicts and you can both accept further changes
> > > for v4.9 release. Trying to take half the series via rproc, and half via dma trees won't work
> > > because they have dependencies on each other.
> > >
> > > I will send a v11 series in a moment which includes the feedback in this email
> > > and also include the additional fixes which Vinod has applied since the driver
> > > has been in linux-next.
> >
> > WHY.. Stuff is already merged twice!
>
> When the feedback is "there is an unrelated change in this patch", the only way
> you can fix that is by having a new version of the patch.
It can be reverted and clean patch applied..
--
~Vinod
--
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
WARNING: multiple messages have this Message-ID (diff)
From: vinod.koul@intel.com (Vinod Koul)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v10 01/11] remoteproc: st_slim_rproc: add a slimcore rproc driver
Date: Wed, 16 Nov 2016 09:02:06 +0530 [thread overview]
Message-ID: <20161116033206.GX3000@localhost> (raw)
In-Reply-To: <20161114114216.GA8986@griffinp-ThinkPad-X1-Carbon-2nd>
On Mon, Nov 14, 2016 at 11:42:16AM +0000, Peter Griffin wrote:
> Hi Vinod,
>
> On Mon, 14 Nov 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
>
> OK.
>
> >
> > >
> > > That way there won't be any conflicts and you can both accept further changes
> > > for v4.9 release. Trying to take half the series via rproc, and half via dma trees won't work
> > > because they have dependencies on each other.
> > >
> > > I will send a v11 series in a moment which includes the feedback in this email
> > > and also include the additional fixes which Vinod has applied since the driver
> > > has been in linux-next.
> >
> > WHY.. Stuff is already merged twice!
>
> When the feedback is "there is an unrelated change in this patch", the only way
> you can fix that is by having a new version of the patch.
It can be reverted and clean patch applied..
--
~Vinod
next prev parent reply other threads:[~2016-11-16 3:32 UTC|newest]
Thread overview: 61+ 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
2016-10-18 9:39 ` Peter Griffin
2016-10-18 9:39 ` [PATCH v10 01/11] remoteproc: st_slim_rproc: add a slimcore rproc driver Peter Griffin
2016-10-18 9:39 ` Peter Griffin
2016-10-18 9:39 ` Peter Griffin
2016-11-03 21:37 ` Bjorn Andersson
2016-11-03 21:37 ` Bjorn Andersson
2016-11-03 21:37 ` Bjorn Andersson
2016-11-07 13:57 ` Peter Griffin
2016-11-07 13:57 ` Peter Griffin
2016-11-07 13:57 ` Peter Griffin
2016-11-14 5:18 ` Vinod Koul
2016-11-14 5:18 ` Vinod Koul
2016-11-14 5:18 ` Vinod Koul
2016-11-14 11:42 ` Peter Griffin
2016-11-14 11:42 ` Peter Griffin
2016-11-16 3:32 ` Vinod Koul [this message]
2016-11-16 3:32 ` Vinod Koul
2016-11-16 3:32 ` Vinod Koul
2016-11-17 6:36 ` Bjorn Andersson
2016-11-17 6:36 ` Bjorn Andersson
2016-11-17 6:36 ` Bjorn Andersson
2016-11-17 9:52 ` Vinod Koul
2016-11-17 9:52 ` Vinod Koul
2016-11-18 16:40 ` Bjorn Andersson
2016-11-18 16:40 ` Bjorn Andersson
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 ` Peter Griffin
2016-10-18 9:39 ` Peter Griffin
2016-10-18 9:39 ` [PATCH v10 03/11] remoteproc: Update Kconfig setup to 'depends on REMOTEPROC' Peter Griffin
2016-10-18 9:39 ` Peter Griffin
2016-10-18 9:39 ` 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 ` Peter Griffin
2016-10-18 9:39 ` 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 ` 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 ` Peter Griffin
2016-10-18 9:39 ` 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 ` Peter Griffin
2016-10-18 9:39 ` 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 ` Peter Griffin
2016-10-18 9:39 ` 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 ` 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 ` Peter Griffin
2016-10-18 9:39 ` Peter Griffin
2016-10-18 9:39 ` [PATCH v10 11/11] ARM: multi_v7_defconfig: Enable STi and simple-card drivers Peter Griffin
2016-10-18 9:39 ` Peter Griffin
2016-10-18 10:21 ` Mark Brown
2016-10-18 10:21 ` Mark Brown
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
2016-10-18 14:43 ` 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
2016-10-08 12:52 ` Peter Griffin
2016-10-08 12:52 ` 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=20161116033206.GX3000@localhost \
--to=vinod.koul@intel.com \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=kernel@stlinux.com \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=ohad@wizery.com \
--cc=patrice.chotard@st.com \
--cc=peter.griffin@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.