From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754751AbbLaCab (ORCPT ); Wed, 30 Dec 2015 21:30:31 -0500 Received: from ozlabs.org ([103.22.144.67]:38921 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752153AbbLaCaZ (ORCPT ); Wed, 30 Dec 2015 21:30:25 -0500 Date: Thu, 31 Dec 2015 13:30:22 +1100 From: Stephen Rothwell To: Doug Ledford , "J. Bruce Fields" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig Subject: linux-next: manual merge of the rdma tree with the nfsd tree Message-ID: <20151231133022.0b3ecab9@canb.auug.org.au> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) 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 conflicts in a quite a few files between (mostly, I think) commit: 6c7b6d2d442c ("IB: merge struct ib_device_attr into struct ib_device") from the nfsd tree and various commits from the rdma tree. It would have taken me considerable time to fix the conflicts up, so I have dropped teh rdma tree for today (just because it was merged second). Please have a conversation and figure out how you are going to cooperate and get these conflicts fixed e.g. set up a stable branch with Christoph's commit (and any other conflicting commits) in it and merge that into both trees. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au