From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754110AbdFNAUi (ORCPT ); Tue, 13 Jun 2017 20:20:38 -0400 Received: from ozlabs.org ([103.22.144.67]:37483 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754060AbdFNAUg (ORCPT ); Tue, 13 Jun 2017 20:20:36 -0400 Date: Wed, 14 Jun 2017 10:20:33 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Tomer Tayar , Yuval Mintz Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20170614102033.27d1ad1f@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_debug.c between commit: ace17c369295 ("qed: fix dump of context data") from the net tree and commit: 7b6859fbdcc4 ("qed: Utilize FW 8.20.0.0") from the net-next tree. I fixed it up (the latter incorporated 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