From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751392AbdBLXad (ORCPT ); Sun, 12 Feb 2017 18:30:33 -0500 Received: from ozlabs.org ([103.22.144.67]:34845 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751000AbdBLXac (ORCPT ); Sun, 12 Feb 2017 18:30:32 -0500 Date: Mon, 13 Feb 2017 10:30:29 +1100 From: Stephen Rothwell To: Leon Romanovsky Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Doug Ledford Subject: linux-next: manual merge of the rdma-leon tree with Linus' tree Message-ID: <20170213103029.60176142@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Leon, Today's linux-next merge of the rdma-leon tree got a conflict in: include/uapi/rdma/ib_user_verbs.h between commit: 646ebd4166ca ("RDMA: Don't reference kernel private header from UAPI header") from Linus' tree and commit: 39bfb78f4acb ("RDMA: Remove kernel private defines and reference to header from UAPI") from the rdma-leon tree. More or less the same patch. I fixed it up (I used the version from Linus' tree (as it contains explanatory comments)) 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. -- Cheers, Stephen Rothwell