From patchwork Sun Dec 6 23:31:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11954495 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=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 84B9EC19425 for ; Sun, 6 Dec 2020 23:32:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 51D832311B for ; Sun, 6 Dec 2020 23:32:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727040AbgLFXcf (ORCPT ); Sun, 6 Dec 2020 18:32:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726046AbgLFXcf (ORCPT ); Sun, 6 Dec 2020 18:32:35 -0500 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9FE8C0613D0; Sun, 6 Dec 2020 15:31:54 -0800 (PST) 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 4Cq2lV1tJjz9sW0; Mon, 7 Dec 2020 10:31:49 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1607297511; bh=veDtRoJjNpeoUhwU9xkUV0ECvQ2G/BDfl8peuJgxMaw=; h=Date:From:To:Cc:Subject:From; b=JQWY4q1Y542c2L6rqkdeQn8NkOrK2CyJt73RBiX7VBJM+FW+lPbJHZmUe4hAnFnik zE+13t0imSJ5oINuKrbh8z/jch7Cg4pVOj/7RsnxJXrbmBEOhF5z7PEJ87ZPFDsPLa xPmgHHqy5SlY92CkDXr9wWVbHctu7JaCoxypBXCUf6m1wGUOeiZ7JHIKAtcf8X9SW8 m/Kc51B5hP2WHNFpONI/E3WNST7U8InwJ8jMrCwyThHdZGO2jBCE/13x/DYYncPj/+ aFsZVXf07nsSEhkvukrhkiuNlpAUZNb2qHRD9aXAOW+HZPephSYk2JM518ygLtH0+X AO9Ss6a+O+Xqw== Date: Mon, 7 Dec 2020 10:31:47 +1100 From: Stephen Rothwell To: Anna Schumaker , Trond Myklebust , NFS Mailing List Cc: Linux Kernel Mailing List , Linux Next Mailing List , Trond Myklebust Subject: linux-next: manual merge of the nfs-anna tree with the nfs tree Message-ID: <20201207103147.4173f701@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Hi all, Today's linux-next merge of the nfs-anna tree got a conflict in: net/sunrpc/xdr.c between commit: 0279024f2270 ("SUNRPC: Fix up xdr_set_page()") from the nfs tree and commit: 861b1da5a534 ("SUNRPC: Keep buf->len in sync with xdr->nwords when expanding holes") from the nfs-anna 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/xdr.c index c852d199c789,5b848fe65c81..000000000000 --- a/net/sunrpc/xdr.c