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 X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9649C10F29 for ; Tue, 17 Mar 2020 09:05:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2CD720719 for ; Tue, 17 Mar 2020 09:05:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725933AbgCQJFL (ORCPT ); Tue, 17 Mar 2020 05:05:11 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:53647 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725872AbgCQJFL (ORCPT ); Tue, 17 Mar 2020 05:05:11 -0400 Received: from p5de0bf0b.dip0.t-ipconnect.de ([93.224.191.11] helo=nanos.tec.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1jE89p-0004bp-Tc; Tue, 17 Mar 2020 10:05:06 +0100 Received: by nanos.tec.linutronix.de (Postfix, from userid 1000) id BF3EF101161; Tue, 17 Mar 2020 10:05:04 +0100 (CET) From: Thomas Gleixner To: Logan Gunthorpe , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Bjorn Helgaas Cc: Sebastian Andrzej Siewior Subject: Re: [PATCH] PCI/switchtec: Fix init_completion race condition with poll_wait() In-Reply-To: <38781f88-32df-e89a-7d00-fd2fcc097497@deltatee.com> References: <20200313183608.2646-1-logang@deltatee.com> <87mu8fdck6.fsf@nanos.tec.linutronix.de> <38781f88-32df-e89a-7d00-fd2fcc097497@deltatee.com> Date: Tue, 17 Mar 2020 10:05:04 +0100 Message-ID: <87k13jcpxb.fsf@nanos.tec.linutronix.de> MIME-Version: 1.0 Content-Type: text/plain X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Logan Gunthorpe writes: > On 2020-03-16 6:56 p.m., Thomas Gleixner wrote: >> @Bjorn: Can you please hold off on this for a few days until we sorted >> out the remaining issues to avoid potential merge conflicts >> vs. the completion series? > > I'd suggest simply rebasing the completion patch on this patch, or a > patch like it. Then we'll have the proper bug fix commit and there won't > be a conflict. The conflict is not a question of rebasing or not. The conflict arises when this patch is routed through PCI simply because then the rest of the completion work is stuck until this hits mainline. Thanks, tglx