From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757972AbcCVARl (ORCPT ); Mon, 21 Mar 2016 20:17:41 -0400 Received: from ozlabs.org ([103.22.144.67]:35964 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750962AbcCVARk (ORCPT ); Mon, 21 Mar 2016 20:17:40 -0400 Date: Tue, 22 Mar 2016 11:17:37 +1100 From: Stephen Rothwell To: Doug Ledford Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Bhaktipriya Shridhar , Greg Kroah-Hartman , Jubin John Subject: linux-next: manual merge of the rdma tree with Linus' tree Message-ID: <20160322111737.182bd3f9@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 Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/staging/rdma/hfi1/mad.c between commits: a4fe1bc16411 ("staging: rdma: hfi1: Remove casts of pointer to same type") acc17d671c62 ("staging: rdma: hfi1: Remove unnecessary parantheses") from Linus' tree and commit: 58721b8f8c71 ("staging/rdma/hfi1: Remove unnecessary parentheses") from the rdma tree. I fixed it up (the result was like the former) 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