From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758032AbcCVA3X (ORCPT ); Mon, 21 Mar 2016 20:29:23 -0400 Received: from ozlabs.org ([103.22.144.67]:51621 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751111AbcCVA3W (ORCPT ); Mon, 21 Mar 2016 20:29:22 -0400 Date: Tue, 22 Mar 2016 11:29:20 +1100 From: Stephen Rothwell To: Doug Ledford Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Bhaktipriya Shridhar , Greg Kroah-Hartman , Mitko Haralanov Subject: linux-next: manual merge of the rdma tree with Linus' tree Message-ID: <20160322112920.733aac03@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/user_pages.c between commit: 7e43d4d25558 ("staging: rdma: hfi1: Compress return logic") from Linus' tree and commit: 0b091fb32c5a ("staging/hfi1: Enable TID caching feature") from the rdma tree. I fixed it up (the latter removed the function that was updated in 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