From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752070AbcFTBWc (ORCPT ); Sun, 19 Jun 2016 21:22:32 -0400 Received: from ozlabs.org ([103.22.144.67]:57679 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751705AbcFTBWZ (ORCPT ); Sun, 19 Jun 2016 21:22:25 -0400 Date: Mon, 20 Jun 2016 11:20:46 +1000 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Yuval Mintz Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20160620112046.43715de9@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/qlogic/qed/qed_hsi.h between commit: b639f197210d ("qed: Add missing port-mode") from the net tree and commit: 351a4dedb34c ("qed: Utilize FW 8.10.3.0") from the net-next tree. I fixed it up (the net-next tree version is a superset of the net tree version) 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