From mboxrd@z Thu Jan 1 00:00:00 1970 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=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham 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 57304C43219 for ; Mon, 29 Apr 2019 22:21:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 31BFE2075E for ; Mon, 29 Apr 2019 22:21:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729643AbfD2WVh (ORCPT ); Mon, 29 Apr 2019 18:21:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44814 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729625AbfD2WVg (ORCPT ); Mon, 29 Apr 2019 18:21:36 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 30CE181106; Mon, 29 Apr 2019 22:21:36 +0000 (UTC) Received: from haswell-e.nc.xsintricity.com (ovpn-112-9.rdu2.redhat.com [10.10.112.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D8720692AA; Mon, 29 Apr 2019 22:21:34 +0000 (UTC) Message-ID: <16bb268f0b5b62d71cc65204bccea856333b87d8.camel@redhat.com> Subject: Re: linux-next: manual merge of the rdma-fixes tree with Linus' tree From: Doug Ledford To: Stephen Rothwell , Jason Gunthorpe Cc: Linux Next Mailing List , Linux Kernel Mailing List , Leon Romanovsky , Heiko Carstens , Linus Torvalds Date: Mon, 29 Apr 2019 18:21:32 -0400 In-Reply-To: <20190430081346.3196b60f@canb.auug.org.au> References: <20190430081346.3196b60f@canb.auug.org.au> Organization: Red Hat, Inc. Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-kTp3XO4XHgKUZmRW43En" User-Agent: Evolution 3.30.5 (3.30.5-1.fc29) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 29 Apr 2019 22:21:36 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-kTp3XO4XHgKUZmRW43En Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2019-04-30 at 08:13 +1000, Stephen Rothwell wrote: > Hi all, >=20 > Today's linux-next merge of the rdma-fixes tree got a conflict in: >=20 > drivers/infiniband/core/uverbs_main.c >=20 > between commit: >=20 > 6a5c5d26c4c6 ("rdma: fix build errors on s390 and MIPS due to bad ZERO_= PAGE use") >=20 > from Linus' tree and commit: >=20 > d79a26b99f5f ("RDMA/uverbs: Fix compilation error on s390 and mips plat= forms") >=20 > from the rdma-fixes tree. >=20 > I fixed it up (I just used the version from Linus' tree) and can carry th= e > 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. >=20 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). --=20 Doug Ledford GPG KeyID: B826A3330E572FDD Key fingerprint =3D AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD --=-kTp3XO4XHgKUZmRW43En Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEErmsb2hIrI7QmWxJ0uCajMw5XL90FAlzHeOwACgkQuCajMw5X L93igA//bArimttUT9ZAcK4JA+fRqDSS+4dcaQMFk9Oh32EFWRwse525YYSz3s7Q 8jPpVpZezM2gJ5Pt8ue7/6uXDkRJbOyQw6rlIe/pEvZ5M3UsSdXM3+m5BKyViCPP HlGQQVbYspvZNPSJhriogtY+vNMBxBYngRqCNpwEJzF52fSGA/OF+aXkM/Qy20/B +FORwCCVq7QQTWYdkW/qAbI+PicPGnow2NGo+ghXyxYifU8L0TKzEmAd5xvZOJmj HW7c1KvQKcDtATPDrsLVziyrmozq+2NvoDfaBdSq/IRMcw4pSgbgCO0UKaYBvb9o X27TTQRP+JNcDVzgBhKNvZZhWZYhGo40nGnOgfaFiCwIHl7Dl102NP5cN5eHldwL QR/X/IZC8yL6E8CUe8IJdi01EHJPD86m8zg0oqNI6IAjqFuuWm+JGIJ4R/7iwOPp C1SG1taStDvpziwcXFXhpn3ayKQcjbNAJwMFqZCAjIYs4CFSiZBrGe2FjzATnrE1 HqmX1kXl18B93R0C1DOecC/3Xaih7YjyeQ0VYkfpP063ju0dXYNNSg2AqnstWWWK o985i9l1YQ0IkxvkzOo8VggMmlwy+kf2HMoiRZaXyMnyYEG1QFxYyPp1Ugfw12o5 +OmrkpnjyLrFcBf/P8ZV+EhNg2szlTYuBLLzoGQuQydyU9kk0qM= =PsyW -----END PGP SIGNATURE----- --=-kTp3XO4XHgKUZmRW43En--