From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754051AbcHVBvm (ORCPT ); Sun, 21 Aug 2016 21:51:42 -0400 Received: from ozlabs.org ([103.22.144.67]:35891 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753560AbcHVBvk (ORCPT ); Sun, 21 Aug 2016 21:51:40 -0400 Date: Mon, 22 Aug 2016 11:51:35 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Hariprasad Shenai Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20160822115135.6a5e0f19@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 all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c between commit: e0d8b2908696 ("cxgb4: Fixes resource allocation for ULD's in kdump kernel") from the net tree and commit: 94cdb8bb993a ("cxgb4: Add support for dynamic allocation of resources for ULD") from the net-next tree. I fixed it up (I just used the version form the net-next tree) 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