From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9C4E2A0093 for ; Thu, 28 May 2020 18:25:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8A4991DC22; Thu, 28 May 2020 18:25:50 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id DAADA1DC26 for ; Thu, 28 May 2020 18:25:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yC7djV4cOjBJbBRlTxuqPGltmW8f9lqLUfJyd1RI/vY=; b=NjN05FL/HnGzhBbW3OeaA4FshWha1z5Ye+TgQR9wt2Kixk+IGUgoMreJyt5B+XSb1QsjGC hdFBPkUHqVuiogW6rH71nRNPBgDTHbliNRbhH1qNhPPxxQk0XCAjggKB49n/EHF4aF6V1r OZ267eFZFScfV38VXcFgXsqRpW6O7EI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-445-rswiLiW0Md6jgRuXByhZtQ-1; Thu, 28 May 2020 12:25:44 -0400 X-MC-Unique: rswiLiW0Md6jgRuXByhZtQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 73C9B80183C; Thu, 28 May 2020 16:25:43 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6620060C05; Thu, 28 May 2020 16:25:42 +0000 (UTC) From: Kevin Traynor To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , dpdk stable Date: Thu, 28 May 2020 17:22:54 +0100 Message-Id: <20200528162322.7863-67-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ena/base: fix indentation in CQ polling' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/17d3b48eed1688cf48e2054136efcb616459b2cf Thanks. Kevin. --- >From 17d3b48eed1688cf48e2054136efcb616459b2cf Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Wed, 8 Apr 2020 10:29:02 +0200 Subject: [PATCH] net/ena/base: fix indentation in CQ polling [ upstream commit 6a5283bbad7a17fa5556c55e00e4fe1828039285 ] The spaces instead of tabs were used for the indent. Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version") Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Guy Tzalik --- drivers/net/ena/base/ena_com.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c index 4a6bc5e179..19eec493ed 100644 --- a/drivers/net/ena/base/ena_com.c +++ b/drivers/net/ena/base/ena_com.c @@ -533,9 +533,9 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c while (1) { - ENA_SPINLOCK_LOCK(admin_queue->q_lock, flags); - ena_com_handle_admin_completion(admin_queue); - ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags); + ENA_SPINLOCK_LOCK(admin_queue->q_lock, flags); + ena_com_handle_admin_completion(admin_queue); + ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags); - if (comp_ctx->status != ENA_CMD_SUBMITTED) + if (comp_ctx->status != ENA_CMD_SUBMITTED) break; -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:02.563629939 +0100 +++ 0067-net-ena-base-fix-indentation-in-CQ-polling.patch 2020-05-28 17:12:59.147555359 +0100 @@ -1 +1 @@ -From 6a5283bbad7a17fa5556c55e00e4fe1828039285 Mon Sep 17 00:00:00 2001 +From 17d3b48eed1688cf48e2054136efcb616459b2cf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6a5283bbad7a17fa5556c55e00e4fe1828039285 ] + @@ -18 +20 @@ -index 962baf6024..f128d3c4f3 100644 +index 4a6bc5e179..19eec493ed 100644