From patchwork Fri May 29 00:59:17 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: 11577391
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 050361391
	for <patchwork-linux-nfs@patchwork.kernel.org>;
 Fri, 29 May 2020 00:59:26 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id D14DF20B80
	for <patchwork-linux-nfs@patchwork.kernel.org>;
 Fri, 29 May 2020 00:59:25 +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="ti79V7II"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2438189AbgE2A7Y (ORCPT
        <rfc822;patchwork-linux-nfs@patchwork.kernel.org>);
        Thu, 28 May 2020 20:59:24 -0400
Received: from ozlabs.org ([203.11.71.1]:47263 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S2438188AbgE2A7Y (ORCPT <rfc822;linux-nfs@vger.kernel.org>);
        Thu, 28 May 2020 20:59:24 -0400
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 49Y5n31b4zz9sRK;
        Fri, 29 May 2020 10:59:18 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1590713960;
        bh=YSNC8nJ5eu33vdCCoyFy+TEvR5PMySe/tykBI2tGyVs=;
        h=Date:From:To:Cc:Subject:From;
        b=ti79V7IIVSe002hM3tjAgeStpzQdnRUmAIe9PN0EJh++vSSCqqD2zNgj7QCRjEIeJ
         XzRw0VD78NGLrZ9L6+i2e5exKTI+8raXmsLTOTrG7W7td4qqZtQCD86J9DVmGX1CSS
         rHvl0QmL9BhiMoS6bplpOiJ+JeF63EpyCamd0B5CeqTru9Oo98O5nET5zujFLALq2Y
         o+dctlpM+YFcwVZGG/lQnAKiGrwbYWVu9P4TETt+CzEQkX7aXSgjIWkwjUaNKuAydy
         6tU6VBzEWamJPw9Y73M5YGlFh9UOk+IZSPnveG5YEaXCeGxhqtGHyOld3CWrBzYbZ9
         82aSwC/q6MKnw==
Date: Fri, 29 May 2020 10:59:17 +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: <20200529105917.50dfc40f@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:

  include/trace/events/sunrpc.h

between commit:

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

from the nfs-anna tree and commit:

  998024dee197 ("SUNRPC: Add more svcsock tracepoints")

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 include/trace/events/sunrpc.h
index 73193c79fcaa,852413cbb7d9..000000000000
--- a/include/trace/events/sunrpc.h