From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 24C41EB64DD for ; Thu, 17 Aug 2023 10:02:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BzOg5S+HkQsZmHUadg0OUdXnofNyYtwSRfX0BGSI3r8=; b=CfbN7zHsIyES01 lRy0g5Lb+qo5r4FpKpz8jQLqelPVVTxK5VBIHgjlnD8TeB9Gm6XAD+bKYfxTO76XsXnS9DyksYpZ9 Rvv8Aku9lnij0/kCkcLz92Q0+4Wri8AsX8Xrzccv2tm+zF1IT9+tvvtcW4wxSZQSRjue0helw0hly aLsL4pZlem0TE8LEIIYCcNwjd6Ygs/czIqYOtjlwVvLHbcHeMM3+pFK/JGh7SmI+TLonZsjDuGeBF JA+E9MrYViR+QUDz3Ng0vOdw2s6xwBPkFz0JsBDhZcfmUqi5jdt7HRdREmxRUPk3iFQILAZu69roP oW1j2h7XaWDl1g5NgtbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qWZp8-005zng-2Q; Thu, 17 Aug 2023 10:01:50 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qWZp6-005znF-1k for linux-arm-kernel@lists.infradead.org; Thu, 17 Aug 2023 10:01:49 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6877CD75; Thu, 17 Aug 2023 03:02:26 -0700 (PDT) Received: from [10.1.197.1] (ewhatever.cambridge.arm.com [10.1.197.1]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E97A83F64C; Thu, 17 Aug 2023 03:01:43 -0700 (PDT) Message-ID: <7cd0970f-c8a4-dd99-c27f-542fef608249@arm.com> Date: Thu, 17 Aug 2023 11:01:42 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH 2/2] coresight: trbe: Allocate platform data per device Content-Language: en-US To: Anshuman Khandual , 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 References: <20230814093813.19152-1-hejunhao3@huawei.com> <20230816141008.535450-1-suzuki.poulose@arm.com> <20230816141008.535450-2-suzuki.poulose@arm.com> <9cd9f83c-7778-2d87-a175-a4cb7ceb8723@arm.com> From: Suzuki K Poulose In-Reply-To: <9cd9f83c-7778-2d87-a175-a4cb7ceb8723@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230817_030148_635369_053922B9 X-CRM114-Status: UNSURE ( 7.94 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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