From patchwork Wed Nov 4 00:43:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1393521 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=Gy4FnBUt; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CQnw72hBPz9sVN for ; Wed, 4 Nov 2020 11:44:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730080AbgKDAoD (ORCPT ); Tue, 3 Nov 2020 19:44:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725811AbgKDAoD (ORCPT ); Tue, 3 Nov 2020 19:44:03 -0500 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEDFFC061A4B; Tue, 3 Nov 2020 16:44:02 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4CQnw01ZN4z9sPB; Wed, 4 Nov 2020 11:43:59 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1604450640; bh=w0opC8OEmqjeVqj+i2Je/xg3+AnOLhlxj013J6qVXgk=; h=Date:From:To:Cc:Subject:From; b=Gy4FnBUtYp6/7clc/dPA1/4uatCQIRgfs5PvZPHgcBtC4hqmDsJc644+c/toD2rhs nUcwOAaIfs1vVtDZK+plquYYglYvXTeaQJg/lw93bcCNbhQO4cq401pAcaqCs4gvKz +SD1wddBiKMRmk9ct/cvEG1suZzOcQ1UVb7tlryT3mb/SvorqJq1vMm9Pje0L2dJRu n84RL5XR3ARwlpf8GjG7zXA5nResZnTiwl8iJLo+vlXOQM42BoC/LnaROJGNK+Og04 yQVE8e0Syr6JjMVJ6V17kyUOtgtRi7kqWZLO/8hVWVCnoaS+CIkR2cGN+dgUcb45S6 ntNCRH/77fcZg== Date: Wed, 4 Nov 2020 11:43:58 +1100 From: Stephen Rothwell To: David Miller , Networking , Jakub Kicinski Cc: Lijun Pan , Linux Kernel Mailing List , Linux Next Mailing List , Sukadev Bhattiprolu Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20201104114358.37e766a3@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/ibm/ibmvnic.c between commit: 1d8504937478 ("powerpc/vnic: Extend "failover pending" window") from the net tree and commit: 16b5f5ce351f ("ibmvnic: merge do_change_param_reset into do_reset") from the net-next tree. I fixed it up (see below) 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. diff --cc drivers/net/ethernet/ibm/ibmvnic.c index da15913879f8,f4167de30461..000000000000 --- a/drivers/net/ethernet/ibm/ibmvnic.c