From patchwork Fri May 29 01:05:38 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 11577393
Return-Path: <SRS0=+sI5=7L=vger.kernel.org=linux-nfs-owner@kernel.org>
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
 [172.30.200.123])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BCC1C166C
	for <patchwork-linux-nfs@patchwork.kernel.org>;
 Fri, 29 May 2020 01:05:46 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 8FBA720829
	for <patchwork-linux-nfs@patchwork.kernel.org>;
 Fri, 29 May 2020 01:05:46 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
 header.b="VYrurR55"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2438206AbgE2BFp (ORCPT
        <rfc822;patchwork-linux-nfs@patchwork.kernel.org>);
        Thu, 28 May 2020 21:05:45 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56730 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2438203AbgE2BFo (ORCPT
        <rfc822;linux-nfs@vger.kernel.org>); Thu, 28 May 2020 21:05:44 -0400
Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 138DEC08C5C6;
        Thu, 28 May 2020 18:05:44 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits)
 server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 49Y5wM48S4z9sSm;
        Fri, 29 May 2020 11:05:39 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1590714340;
        bh=Z20gFtDzP5c0COPxIaNotJ+e2emc7JlN6W9UKhFm/ys=;
        h=Date:From:To:Cc:Subject:From;
        b=VYrurR55T1tiJOS0rPb3cKu32pwneL2cf1e40/C2YzRpiYf7wCUJQyAnJH4IzpcU7
         QgiXSOxFhMmLiXEfbeexuR9byrJZ3FUIFEah6CN6OiMTAPADw7MX+YoW37FoQM8vyB
         g2Aot5yVvyu+IP+wG2C6H+FF6PM8jzNL66XuXzVeWbqQaayWojAY2avMigRboEztaK
         hCtAu7trxm6Z8ymaqfyRi2KIdHMFzhUZjo89YOq/KnXwd8S43SmEtMk23NGwy9psgw
         aHmaYVZTTiFZ+0agPpVfeiD2EhT9GyV5F5dU7Ha4GYkKeByVDn1dbtm2LRPzNuVmPu
         oC10srNwRpEZw==
Date: Fri, 29 May 2020 11:05:38 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "J. Bruce Fields" <bfields@fieldses.org>,
        Anna Schumaker <Anna.Schumaker@Netapp.com>,
        Trond Myklebust <trondmy@gmail.com>,
        NFS Mailing List <linux-nfs@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Chuck Lever <chuck.lever@oracle.com>
Subject: linux-next: manual merge of the nfsd tree with the nfs-anna tree
Message-ID: <20200529110538.73d3fecb@canb.auug.org.au>
MIME-Version: 1.0
Sender: linux-nfs-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org

Hi all,

Today's linux-next merge of the nfsd tree got a conflict in:

  net/sunrpc/svc_xprt.c

between commit:

  2baebf955125 ("SUNRPC: Split the xdr_buf event class")

from the nfs-anna tree and commit:

  ca4faf543a33 ("SUNRPC: Move xpt_mutex into socket xpo_sendto methods")

from the nfsd tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc net/sunrpc/svc_xprt.c
index 8ef44275c255,c1ff8cdb5b2b..000000000000
--- a/net/sunrpc/svc_xprt.c