Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp4290462yba; Mon, 29 Apr 2019 17:29:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqzI6PXTGAI+PEp17T833WYL2DV9/sy+fff7tgUQrY6oVjI080bw14hlKUJw15cTynGaQn9q X-Received: by 2002:a17:902:5a81:: with SMTP id r1mr10344086pli.147.1556584190794; Mon, 29 Apr 2019 17:29:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556584190; cv=none; d=google.com; s=arc-20160816; b=owX0xyAkwephGWQDFnAgpCf5StBKVXCg9RLmzFc1xEGWUWbcy/bZ+32xXQBXQbIgA7 OJaDm9qCPMNqfD6N/MpsziqHXPcMHU8gGbMhKLoyfBrUGszaofgSnJNydpj6QhvcESbI OzHGqJyL/V8Mpi1HU6CdWN3giBuWpg5ad0DryxN1+v0mJRGTi44ufzEqfpw0biR5iN/t x2Ay9/CbmggAqtCEHqtm84yU6D51Gi8H1IQz+yIhTUugtxZxfc3zUfgmOAtNPX6bPpd2 qGQsqbxJcx52vwJzQ/HCcuW+Iul3mtLd1hQDbjUJd9vnDSXbBZ3e5ewnuhAumMpgk36y cS2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=UD76751nYPvxGSRDoVgi1DlaNbahcBCAjkUUCYAVUBA=; b=0xvqk9kdY015D2BpRePBRcP1GU3/NkekvHO0r1OEOCp7xQujuxzslMigWts875b3ZZ eOYsE1Jb5VJ+oU5HkAPv1jbAps/dntRWEWZ2Wo73/OnjWGHcrDKMnf47D0L5uW7E35Cw OrprWwPksJ1jgKvvIdG+CL2ZwSYywmRCKGpcRDc47621h16eu9u5W12fOr+h30NCFgSm /OQC8sMsXNLNsYcNRDm1wDiK3B320dVPcKxuNbpPliuHFJtcBjk9JyegGJtW/CofGRqg cTI72AsjcOAW5Y2PGeDKjK7GVBPJUZ867+/fa9kIywd47OKa3Q0oqqxtyfthgbR1wzCI FAzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=brJxBtdY; 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 e11si35639907pfd.88.2019.04.29.17.29.34; Mon, 29 Apr 2019 17:29:50 -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=brJxBtdY; 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 S1729651AbfD3A2R (ORCPT + 99 others); Mon, 29 Apr 2019 20:28:17 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:40075 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729214AbfD3A2R (ORCPT ); Mon, 29 Apr 2019 20:28:17 -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 44tMnW0vF3z9s9y; Tue, 30 Apr 2019 10:28:14 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1556584095; bh=jxeomaEGDj9jCiG96b0VM67znI2L+mGjbFhnESNETM4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=brJxBtdYMRHVALu8PXFocfLMPDZ3tsuZp7FEDNu+RazGxYN06hjHyeP5KSWC+S/Um 6qUKslKeTIC3hy9M3Xog0jnzLq7gVhbkhz9SMXh6DMJy3xGB4KLkdbZN+8ApTK1w+t /TVbi3yIXqCatEaRjL1OTXWKRfkpp6Wulw7S7G9n3ccA2uyGRM7OeBZR2ZzA61GX0v PXiQlIxFH+0t/jqVH4lcFcX2nABGZCCj4If6yKXYURX43MjWqcqN2aZcfebzrUCL3T aM4p3aMvXa9218IySs6+helsPVCzW3leyIE0WkND2KRwO3Ng3tfhrx114Vu1nfuU5c MhhvYffVPmhgA== Date: Tue, 30 Apr 2019 10:28:14 +1000 From: Stephen Rothwell To: Doug Ledford Cc: Jason Gunthorpe , Linux Next Mailing List , Linux Kernel Mailing List , Leon Romanovsky , Heiko Carstens , Linus Torvalds Subject: Re: linux-next: manual merge of the rdma-fixes tree with Linus' tree Message-ID: <20190430102814.73f213e1@canb.auug.org.au> In-Reply-To: <16bb268f0b5b62d71cc65204bccea856333b87d8.camel@redhat.com> References: <20190430081346.3196b60f@canb.auug.org.au> <16bb268f0b5b62d71cc65204bccea856333b87d8.camel@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/mSbVZQh6/BdOyK84lieBwgo"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/mSbVZQh6/BdOyK84lieBwgo Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Doug, On Mon, 29 Apr 2019 18:21:32 -0400 Doug Ledford wrote: > > Sorry, I forgot to back that head commit out. Once Linus committed his > fix the one in the rdma tree was superfluous (and wrong anyway). No worries - I even managed to choose the correct one by chance! :-) --=20 Cheers, Stephen Rothwell --Sig_/mSbVZQh6/BdOyK84lieBwgo Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlzHlp4ACgkQAVBC80lX 0GzPhQf/aQox6wP+TJarWwq9a2oRtjQLg9FWKpjkODFhbBh9J2V4+Rk6V/PBFcRZ 03DiD+8goxY7hX8drMtGPfjFSesYbmyQKz6ikM7lfxODpyzZiesHg7cHLLGJYIeb KcLDJnQWpQIaLLvr6hqZ+IPWYQyWzFKs1l70h+eLPfTRdR3niZ3d2hrDEgmYYCLv +VWiphd6VYExwO42Ei7DNuHt2MsA7m+pnATtCWaWS1uj9ay1CSwBq4CCL/h9DJNK rsnOc4VfU4E5AWplyGqQlkO2a8nnwTiAm8ZErvUHKrwFOGlICPjriYgt6SNaHgf6 EcmtTS6tgz74zPlJVa4XnYujb/X/YA== =1DgZ -----END PGP SIGNATURE----- --Sig_/mSbVZQh6/BdOyK84lieBwgo--