public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: Suzuki K Poulose <suzuki.poulose@arm.com>
To: Anshuman Khandual <anshuman.khandual@arm.com>, hejunhao3@huawei.com
Cc: coresight@lists.linaro.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	jonathan.cameron@huawei.com, leo.yan@linaro.org,
	mike.leach@linaro.org, james.clark@arm.com, linuxarm@huawei.com,
	yangyicong@huawei.com, prime.zeng@hisilicon.com
Subject: Re: [PATCH 2/2] coresight: trbe: Allocate platform data per device
Date: Thu, 17 Aug 2023 11:01:42 +0100	[thread overview]
Message-ID: <7cd0970f-c8a4-dd99-c27f-542fef608249@arm.com> (raw)
In-Reply-To: <9cd9f83c-7778-2d87-a175-a4cb7ceb8723@arm.com>

On 17/08/2023 07:37, Anshuman Khandual wrote:
> Hi Suzuki,
> 
> Seems like this patch is going to conflict with the below proposed change
> 
> https://lore.kernel.org/all/20230817055405.249630-4-anshuman.khandual@arm.com/
> 
> Please let me know how should we resolve this conflict.

Please rebase your change on top of this one.

Suzuki



_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2023-08-17 10:02 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-14  9:38 [PATCH 0/2] Fix some issues with TRBE building as a module Junhao He
2023-08-14  9:38 ` [PATCH 1/2] coresight: trbe: Fix TRBE potential sleep in atomic context Junhao He
2023-08-14 10:34   ` Suzuki K Poulose
2023-08-14 13:32     ` hejunhao
2023-08-14 22:57       ` Suzuki K Poulose
2023-08-15 11:40         ` hejunhao
2023-08-14  9:38 ` [PATCH 2/2] coresight: core: Fix multiple free TRBE platform data resource Junhao He
2023-08-14 22:47   ` Suzuki K Poulose
2023-08-15 11:38     ` hejunhao
2023-08-16 13:13       ` Suzuki K Poulose
2023-08-16 13:58         ` Suzuki K Poulose
2023-08-16 14:10 ` [PATCH v2 1/2] coresight: trbe: Fix TRBE potential sleep in atomic context Suzuki K Poulose
2023-08-16 14:10   ` [PATCH 2/2] coresight: trbe: Allocate platform data per device Suzuki K Poulose
2023-08-17  6:37     ` Anshuman Khandual
2023-08-17  9:24       ` James Clark
2023-08-17 10:01         ` Suzuki K Poulose
2023-08-17 10:16           ` Anshuman Khandual
2023-08-17 10:33             ` Suzuki K Poulose
2023-08-17 10:01       ` Suzuki K Poulose [this message]
2023-08-17  8:47     ` hejunhao
2023-08-17  7:13   ` [PATCH v2 1/2] coresight: trbe: Fix TRBE potential sleep in atomic context Anshuman Khandual
2023-08-17  8:41     ` hejunhao
2023-08-17  9:57       ` James Clark
2023-08-17  9:59     ` Suzuki K Poulose
2023-08-17  6:18 ` [PATCH 0/2] Fix some issues with TRBE building as a module Anshuman Khandual

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=7cd0970f-c8a4-dd99-c27f-542fef608249@arm.com \
    --to=suzuki.poulose@arm.com \
    --cc=anshuman.khandual@arm.com \
    --cc=coresight@lists.linaro.org \
    --cc=hejunhao3@huawei.com \
    --cc=james.clark@arm.com \
    --cc=jonathan.cameron@huawei.com \
    --cc=leo.yan@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=mike.leach@linaro.org \
    --cc=prime.zeng@hisilicon.com \
    --cc=yangyicong@huawei.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