From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C41A445A78 for ; Tue, 1 Oct 2024 10:25:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B96024064A; Tue, 1 Oct 2024 10:25:50 +0200 (CEST) Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by mails.dpdk.org (Postfix) with ESMTP id 05EAB4026C; Tue, 1 Oct 2024 10:25:47 +0200 (CEST) Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-45830ff5b70so45479721cf.1; Tue, 01 Oct 2024 01:25:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727771147; x=1728375947; darn=dpdk.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=817FPdZZpE3j0lw02eve6mss7lFsjbr97PXK9esT6kY=; b=LpOGPZJrhZSsv4SqDnOqR2Ylyul19fC6n0EpndpYVjBSYfZmHmcr6+GH4B5RdOb3o8 fbOvP2lOZwMcBCaGRrqRMOjBToS/QYUy7gRSN33ZbZkbthxYvamF8jJZhqajUrRUemaV Nc9vp8u35Hnm7MGOTD5Axc8W0Gs4NNMwd4Y+Up2HZ2eMeR01D+A6ovZ/DN4DwCJZXSkq rvRsnjimOWWdigTkeSvPcjJdxKeOE3ifMyzJq+HvaF4m3csyIWy2plITQ1HRgdW6SHJP e89pLVK4KtG5pZXextl5E3m5BON9OViW541eYPd9O5Kmw9SoIgDvoOvZyWHb91G0MH8Q 7aEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727771147; x=1728375947; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=817FPdZZpE3j0lw02eve6mss7lFsjbr97PXK9esT6kY=; b=mqIpkCTqCnoOgjBqbcgPP7ZCEG2SLM/0YYGkt3Qm0rqasSWYqflrSnWDPVwDjRBoq3 doKnOVht+DNE3umLz3UUT6KDtos7PQuoDLeLAOER60ebFEdh4f/nkaMVlgBUi+s51csl r/ppaws2UB1AarkUwGtE6nl/LahLulnRniYFxhWJD1xaNOxhzPHHureuBYe/ZntDAwX3 3Vf5F6OyztufNyMh/+YL6JLdyYzt2V3MeKP5Rqz+aBfMYl4fyOBum+bVjOQ5FZglKkIv UnWelYLI/NBvBHPOPieLKB+E95M3+LjyFMY71n1Pojz6UQAGKV7TMAfudTXfx4RwBwwW YATQ== X-Forwarded-Encrypted: i=1; AJvYcCUSuMcUyNc2OdN+abJKLT+p7gzZ3GH2WfEZFYlpb/zff2LvHriCYjXm3xkyEmHLP7jGOT0=@dpdk.org, AJvYcCVvB06nF75d5gPtE8hciovN6Gptkqe25jRf2oOF+6TxVxzHcohEVtKYp/MbAOGIXpdpy2iQ1+0x@dpdk.org X-Gm-Message-State: AOJu0YzHjFhS8M1vIiq7DdVf+8UTGTlNJofH6C0uMa0hsiGcemPJwaSC x3TTnRjPplluZvDTlCF3YECJ/qQXNPmu0nzjIgcRUCF8hBYN4wGsWezO0BQAPr1K89bVyMx4bw5 nqar/UxL5WnizhxpC2zepa6jOf50= X-Google-Smtp-Source: AGHT+IH5HD7Zl8COu+yP2k5n8fOh6tR6MPhvOOX8F0Vk0Zpu3a4XNo0hQ0Fw/HTaznOC+2bq0mVwZfjinNiEquEutek= X-Received: by 2002:ac8:5f87:0:b0:458:59e3:2b4c with SMTP id d75a77b69052e-45c9f22403dmr241729641cf.24.1727771147083; Tue, 01 Oct 2024 01:25:47 -0700 (PDT) MIME-Version: 1.0 References: <20240919180243.1255-1-pbhagavatula@marvell.com> <20240929160815.2868-1-pbhagavatula@marvell.com> In-Reply-To: <20240929160815.2868-1-pbhagavatula@marvell.com> From: Jerin Jacob Date: Tue, 1 Oct 2024 13:55:21 +0530 Message-ID: Subject: Re: [PATCH v3] common/cnxk: fix IRQ reconfiguration To: pbhagavatula@marvell.com Cc: jerinj@marvell.com, sthotton@marvell.com, hkalra@marvell.com, Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , dev@dpdk.org, stable@dpdk.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org On Sun, Sep 29, 2024 at 9:38=E2=80=AFPM wrote: > > From: Pavan Nikhilesh > > Unregister SSO device and NPA IRQs before resizing > IRQs to cleanup stale IRQ handles. > > Fixes: 993107f0f440 ("common/cnxk: limit SSO interrupt allocation count") > Cc: stable@dpdk.org > > Signed-off-by: Pavan Nikhilesh > --- > v2 Changes: > - Reorder npa interrupt un-registration. > v3 Changes: > - Update commit type to fixes. Could you rebase to next-net-mrvl/for-main [for-main]dell[dpdk-next-net-mrvl] $ git pw series apply 33173 Failed to apply patch: Applying: common/cnxk: fix IRQ reconfiguration Using index info to reconstruct a base tree... M drivers/common/cnxk/roc_dev.c M drivers/common/cnxk/roc_dev_priv.h Falling back to patching base and 3-way merge... Auto-merging drivers/common/cnxk/roc_dev_priv.h Auto-merging drivers/common/cnxk/roc_dev.c CONFLICT (content): Merge conflict in drivers/common/cnxk/roc_dev.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=3Ddiff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort= ". hint: Disable this message with "git config advice.mergeConflict false" Patch failed at 0001 common/cnxk: fix IRQ reconfiguration