Received: by 10.213.65.68 with SMTP id h4csp836420imn; Tue, 20 Mar 2018 17:13:36 -0700 (PDT) X-Google-Smtp-Source: AG47ELtvSIV1eIerWo4DkbA0GXFpcjCggZjKrHYbAfgbj1l8dgfqe8zkr+o0IncyXiK4fjMVvwLv X-Received: by 2002:a17:902:146:: with SMTP id 64-v6mr18325347plb.30.1521591216848; Tue, 20 Mar 2018 17:13:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521591216; cv=none; d=google.com; s=arc-20160816; b=zVIscqmvgcZ9efESHqtfMDipxsBHeAF2wB8k50Ruoj+2U/Flgbk8Cc0Lvb+CUMM6m4 R4rL/7XigrQUy4L+MKwAezYCdoDZ7s8XppjgRaRgjwIWQgXX2iBdsRfiHyji4p7kKKxQ GRI8G3Jc98NImA/5Fy3TgMY650sHedcCvZdvuYTpTJ/hAL9gvFCNMjeEDXwOb+wY0sqQ qSAF3ATeXkgxTvc+kDnE/WlSk2Oaq5vDZIaVFp3VGc949rGpsHeE1c0n82vPHYy+BJaC 67uTft6ecMZr452Hi3cdeVPTtIjccIaOd8qbCnsRAHwdZ8dzINkMfI6kABZDbZ0lF7aM 77Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:subject:cc:to :from:date:dkim-signature:arc-authentication-results; bh=vJ3m3agrpuvSyTpUFGuKPXkvJb1uK6SCql3rJxrY5+4=; b=xaDG0YIfW4FJknflDZL3WNUsgTYgG8wP1cIM64YewIhsdWWKid6SdAefQjX9uBIl9N kvgAtCm40OV9fFalGgOUi/lipL6zOLUiZEKjdk9toTZQyK9iW7Pd4Rc9obIEiwgFvBdP jEO4sxJT2i9GOBJzT5x8+8eg8oGHT06Yg23MK9mZcOXGeuSblMbX3hTaZ1jiUi8xehTk OdpONJI9mhXrNHcs7MFu3lY9Z1d1ASMTo2x6LsRz1GDTZQmuLP1OqPnrr+HuhxErqw/J 7gKfZ0foGaL/HJ/+Nzln5w615oJh5JcEmGCU35J80aP8yd3VcPaKGL1GP0o+J4/lEM1E x3aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=NyK1GRpP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n6-v6si2518282plp.574.2018.03.20.17.13.20; Tue, 20 Mar 2018 17:13:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=NyK1GRpP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751481AbeCUAMY (ORCPT + 99 others); Tue, 20 Mar 2018 20:12:24 -0400 Received: from ozlabs.org ([103.22.144.67]:60903 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751343AbeCUAMW (ORCPT ); Tue, 20 Mar 2018 20:12:22 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 405Vc144TXz9s0t; Wed, 21 Mar 2018 11:12:17 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1521591140; bh=vJ3m3agrpuvSyTpUFGuKPXkvJb1uK6SCql3rJxrY5+4=; h=Date:From:To:Cc:Subject:From; b=NyK1GRpPdMTY5zBaEubkiGiFtXP5Jt9AtVXN2goV5JTPQnO/lpQ3i4z4+URXYxrnC wlF5/MFcAaZ2rtptJY2gkeJKkpZVNATq9PRk3C0A94jmSy7XRcTXyTGNr8QN8wzep1 1rD5DwMlpM8hVzBNDpWkCL95dr9ObS4PYkNdqwIwXoDTjnIRTIIweN2WMrojECnP5c OBjOuBD+TnAo4+gSPZnS7ETf8r9FJifP1iGbblTk+tvD+5WIatssgBTkq0b0+zeU4w GfyaVYvaffp/vvU7dMBTJ5jXfrQNGYHKrPLRnux53WVfe95cWLsPd8zR/JY/3XC0qy 71aRgZcVu7o3Q== Date: Wed, 21 Mar 2018 11:11:40 +1100 From: Stephen Rothwell To: Anna Schumaker , Trond Myklebust , NFS Mailing List Cc: Linux-Next Mailing List , Linux Kernel Mailing List Subject: linux-next: please clean up the nfs-anna tree Message-ID: <20180321111140.618e1e6c@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/WLFs3oQvoBhVVy2EDOm/H.0"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/WLFs3oQvoBhVVy2EDOm/H.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, It only seems to contain commits that have been upsreamed as different commits and is causing conflicts: CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/transport.c CONFLICT (content): Merge conflict in net/sunrpc/xprt.c --=20 Cheers, Stephen Rothwell --Sig_/WLFs3oQvoBhVVy2EDOm/H.0 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlqxozwACgkQAVBC80lX 0GwrPAf/ebBneh78TQ4IIol/aYP56kfjR2m63E03h4qzJi1R4PFH4tZwP7MnfvlQ U9lqke8kwBWFnzUM0lMOMZtF7VKodfWvrfGejqO0eg0qmf3DjXNhSjuW8OW4tTEt t2kPgSSi2aOMyDfCR4qooDBFnB9HKdYGfaDqyMPyjKTObDjwStyhtNOCJcKYBaWz T1QN24g03n0/7TGpYQaVwpDd0aV9Tlvg79kn87/6YNNtIb05ZVo32/pIA4lhNCWR cleFoWfb3kSfCcvA0azAckIPzM4CcP32QB11qbQWtdSbRzcC5WU2Ogo33dX9+/Pl TxDEtj0yZYx27lQZU/K/VLwfNCXumg== =0kRP -----END PGP SIGNATURE----- --Sig_/WLFs3oQvoBhVVy2EDOm/H.0--