Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp1415998ybi; Wed, 19 Jun 2019 20:27:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqzXpDGCo3UOQkfuDk07irj8EMcskrWVvpKNBM6mJao9XtbS3KI4oidIK9B8qCPLVeoHEcRH X-Received: by 2002:a17:902:8509:: with SMTP id bj9mr7875115plb.79.1561001224476; Wed, 19 Jun 2019 20:27:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561001224; cv=none; d=google.com; s=arc-20160816; b=UvJCL22pXiV0w4RwJtbwDH3m6kI9UyrqSQc4gZgy2s5FTACT3oymSfChqY1g4b8+d8 O0yE2kmI+RCvwg0OvGD3Y6CkppemKSGKmRAND6mbnPSW0Ra1tkCKSVe7ya6pl6oFRMDx ZwSbUrmIl5NWPmmovmnSQUvuDJhcuaydcHocYsCEuMWRvoxVifm81QdSsSgRZxJW429k E5b8lWPEXO1laDYrXFjwnNj8u+3s74zZ6bE0zYI+2ISGbOsUaQbUQtNGkTgRDboNsXdn p3fFX1m9sOxs0wg23VJ4vtsqIsuEEFvcdVnlIl5yqxXjw2ol1eF6EYxTgk2Xveqim6K+ pW9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:organization :references:in-reply-to:date:cc:to:from:subject:message-id; bh=FATbaxW1dVyNk2feW1PdBruf7pKGwWnZnjhgkb7VWnQ=; b=RNwrbuOi09hSEYYU0tyyYSan9XfQxVZf4ss7cG8n+K8pYqyBZ01z8DieQvDBAgd7+V XuN458w8LmeKZwZRcgGE3YG21aSWqJptTgE0YGQKTwYlY5Do3tCLl9HQBhp2ELWX9V4w mI4nVtj09TYkruWTs0QUyzNQaVHFDxRLC6dx/nyLHG752Tmw0bowesSi4/+HdU/cy4yu dni6GvFVitYmmvlG1ttitJF2PNXimBHou6SINqiU5glejvBzZlHrE855yqn7ABY44qXA /u8jcnGj7TEOQIxW6inyST44glQ1VK3Zf2t1Ib1Mjyl1g3rpy2iQcAFhiy7gPtbVoQw1 fppQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x22si8655916pln.150.2019.06.19.20.26.48; Wed, 19 Jun 2019 20:27:04 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731323AbfFTDZg (ORCPT + 99 others); Wed, 19 Jun 2019 23:25:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43907 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726389AbfFTDZg (ORCPT ); Wed, 19 Jun 2019 23:25:36 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DDE8975727; Thu, 20 Jun 2019 03:25:33 +0000 (UTC) Received: from linux-ws.nc.xsintricity.com (ovpn-112-50.rdu2.redhat.com [10.10.112.50]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C6459608A7; Thu, 20 Jun 2019 03:25:31 +0000 (UTC) Message-ID: Subject: Re: linux-next: manual merge of the rdma tree with Linus' tree From: Doug Ledford To: Stephen Rothwell , Jason Gunthorpe Cc: Linux Next Mailing List , Linux Kernel Mailing List , Thomas Gleixner , Greg Kroah-Hartman Date: Wed, 19 Jun 2019 23:25:29 -0400 In-Reply-To: <20190620121005.6c01e6ee@canb.auug.org.au> References: <20190620121005.6c01e6ee@canb.auug.org.au> Organization: Red Hat, Inc. Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-Ef3oX6n1UIeoCsBydY2R" User-Agent: Evolution 3.32.2 (3.32.2-1.fc30) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 20 Jun 2019 03:25:35 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-Ef3oX6n1UIeoCsBydY2R Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2019-06-20 at 12:10 +1000, Stephen Rothwell wrote: > 2d3c72ed5041 ("rdma: Remove nes") Yeah, not much you can do about tree wide patchsets conflicting with a removal ;-) --=20 Doug Ledford GPG KeyID: B826A3330E572FDD Fingerprint =3D AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD --=-Ef3oX6n1UIeoCsBydY2R Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEErmsb2hIrI7QmWxJ0uCajMw5XL90FAl0K/KkACgkQuCajMw5X L921cA//QayeKBVGqpUDsqXLmDtY4XqCpmv9iHLgQYBRxCZ/+Okv907+AUwCZW4z gTXgpySiToPeH0JpGCgq63gcHaYa6Gfk7X6g/3W0H6GdQDdWzMSo5on0QgTbRNKW VY1l8FSybjBQG14zKHXgV/7EQ5OmbTI5+dxOBeHLjMEW/TqkcoLwZIAqwOfbwqBU nMKWmVH+OkwrFhCjtmGIIJRZyKjKRdt6j/w3h4cg11U0S2GSl+WMDZJAtNP0YwhX KifiCJdatrGLuqccJccSfPbiqxEhaG/bnTyWl/WFoTCMXaz/+h/daR7hQQjJ9JT1 7F/cHr3C2zs2uxpWsRibLy+YcgC/8m/spxGbtcy4HcWzHsV128BvbaajF2a7eNpT 3G7odE/UxDgL5Dxbsff45kuPk/wSV6yNch6aJDFRzNKa6si4VOtwjUP9alEam267 4qgO5WO5h3ATxyV1n5Vt8BxfdCyT6kGQ8plmJfIvHFmaeqUw6I86I5eMXzynpNPs mZu8HoAuKEJIQgYfcHOevS+NCggJ/9xZk6O9pcgJV2O+lRkElG7x5mxweADovNSJ f64R5qxqyu6mJo5qyjG1L+olnhVRd2x27ZV8B2kI/egrodopnOptW/vcs0SnijIA 32vphY76yhzO4WNg1w7Hr6TMaqr2c2bk8tU9cq2l/7W9DRapP5w= =9Usi -----END PGP SIGNATURE----- --=-Ef3oX6n1UIeoCsBydY2R--