linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tero Kristo <t-kristo@ti.com>
To: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
	Ohad Ben-Cohen <ohad@wizery.com>,
	<linux-remoteproc@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	<linux-omap@vger.kernel.org>, Suman Anna <s-anna@ti.com>
Subject: Re: [PATCHv2 00/15] Remoteproc: updates for OMAP remoteproc support
Date: Wed, 20 Nov 2019 13:28:06 +0200	[thread overview]
Message-ID: <46a3bfb0-6bf1-b3d9-14a6-d2ed5b91c930@ti.com> (raw)
In-Reply-To: <CANLsYkwcWDOPx_rpL5RkzsNLyw+ccPE0bNhar6xv1SZ1=R5xmA@mail.gmail.com>

On 19/11/2019 20:07, Mathieu Poirier wrote:
> On Tue, 19 Nov 2019 at 10:31, Mathieu Poirier
> <mathieu.poirier@linaro.org> wrote:
>>
>> On Tue, 19 Nov 2019 at 07:17, Tero Kristo <t-kristo@ti.com> wrote:
>>>
>>> Hi,
>>>
>>> This is v2 of the series [1], addressing comments from Bjorn and Rob.
>>> Bindings patch is funnily v2.5, as I posted v2 already and wanted to
>>> keep this somehow in sync. Individual patches contain comments about the
>>> changes, or Reviewed-by tags provided if there are no changes.
>>>
>>> I also dropped the conversion patch to SPDX licensing until I can
>>> confirm the license we want to use. Lets just keep the existing in place
>>> until that.
>>>
>>> This series still depends on the reset + clock patches posted earlier,
>>> but both of those dependencies are in linux-next now.
>>
>> I tried to apply your set to today's linux-next (next-20191119) but it
>> fails at patch 13.
> 
> Digging further into this patch 12 is causing problem on next-20191119 (not 13):
> 
> mpoirier@xps15:~/work/remoteproc/kernel-review$ git apply --reject
> 0012-remoteproc-omap-add-support-for-system-suspend-resum.patch
> Checking patch drivers/remoteproc/omap_remoteproc.c...
> Hunk #3 succeeded at 85 (offset -1 lines).
> Hunk #4 succeeded at 99 (offset -1 lines).
> Hunk #5 succeeded at 359 (offset -1 lines).
> Hunk #6 succeeded at 544 (offset -1 lines).
> Hunk #7 succeeded at 952 (offset -1 lines).
> Hunk #8 succeeded at 992 (offset -2 lines).
> Checking patch drivers/remoteproc/omap_remoteproc.h...
> error: while searching for:
> /*
>   * Remote processor messaging
>   *
>   * Copyright (C) 2011 Texas Instruments, Inc.
>   * Copyright (C) 2011 Google, Inc.
>   * All rights reserved.
>   */
> 
> error: patch failed: drivers/remoteproc/omap_remoteproc.h:2
> Hunk #2 succeeded at 57 (offset 25 lines).
> Hunk #3 succeeded at 80 (offset 25 lines).
> Applied patch drivers/remoteproc/omap_remoteproc.c cleanly.
> Applying patch drivers/remoteproc/omap_remoteproc.h with 1 reject...
> Rejected hunk #1.
> Hunk #2 applied cleanly.
> Hunk #3 applied cleanly.
> 
> Your patch expects the last line of the first hunk to be '*/' but it
> is '*' in linux-next.

Hmm right, this seems my bad. This is caused by me dropping the SPDX 
license conversion patch from the series, if that is applied, it goes 
cleanly.

Simple rebase of patch 12 is going to fix that though.

-Tero

> 
>>
>> Mathieu
>>
>>>
>>> -Tero
>>>
>>> [1] https://patchwork.kernel.org/cover/11215421/
>>>
>>>
>>>
>>> --

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

      reply	other threads:[~2019-11-20 11:28 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-19 14:16 [PATCHv2 00/15] Remoteproc: updates for OMAP remoteproc support Tero Kristo
2019-11-19 14:16 ` [PATCHv2.5 01/15] dt-bindings: remoteproc: Add OMAP remoteproc bindings Tero Kristo
2019-11-19 14:16 ` [PATCHv2 02/15] remoteproc/omap: Add device tree support Tero Kristo
2019-11-19 14:16 ` [PATCHv2 03/15] remoteproc/omap: Add a sanity check for DSP boot address alignment Tero Kristo
2019-11-19 14:16 ` [PATCHv2 04/15] remoteproc/omap: Add support to parse internal memories from DT Tero Kristo
2019-11-19 14:16 ` [PATCHv2 05/15] remoteproc/omap: Add the rproc ops .da_to_va() implementation Tero Kristo
2019-11-19 14:16 ` [PATCHv2 06/15] remoteproc/omap: Initialize and assign reserved memory node Tero Kristo
2019-11-19 14:16 ` [PATCHv2 07/15] remoteproc/omap: Add support for DRA7xx remote processors Tero Kristo
2019-11-19 14:16 ` [PATCHv2 08/15] remoteproc/omap: Remove the unused fields from platform data Tero Kristo
2019-11-19 14:16 ` [PATCHv2 09/15] remoteproc/omap: Remove the omap_rproc_reserve_cma declaration Tero Kristo
2019-11-19 14:16 ` [PATCHv2 10/15] remoteproc/omap: Check for undefined mailbox messages Tero Kristo
2019-11-19 14:16 ` [PATCHv2 11/15] remoteproc/omap: Request a timer(s) for remoteproc usage Tero Kristo
2019-11-19 14:16 ` [PATCHv2 12/15] remoteproc/omap: add support for system suspend/resume Tero Kristo
2019-11-19 14:16 ` [PATCHv2 13/15] remoteproc/omap: add support for runtime auto-suspend/resume Tero Kristo
2019-11-19 14:16 ` [PATCHv2 14/15] remoteproc/omap: report device exceptions and trigger recovery Tero Kristo
2019-11-19 14:16 ` [PATCHv2 15/15] remoteproc/omap: add watchdog functionality for remote processors Tero Kristo
2019-11-19 17:31 ` [PATCHv2 00/15] Remoteproc: updates for OMAP remoteproc support Mathieu Poirier
2019-11-19 18:07   ` Mathieu Poirier
2019-11-20 11:28     ` Tero Kristo [this message]

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=46a3bfb0-6bf1-b3d9-14a6-d2ed5b91c930@ti.com \
    --to=t-kristo@ti.com \
    --cc=bjorn.andersson@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-remoteproc@vger.kernel.org \
    --cc=mathieu.poirier@linaro.org \
    --cc=ohad@wizery.com \
    --cc=s-anna@ti.com \
    /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).