From patchwork Fri Aug 30 04:19:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1155706 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="TCO8AFFb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46KR7r3s9jz9sNp for ; Fri, 30 Aug 2019 14:19:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727170AbfH3ETR (ORCPT ); Fri, 30 Aug 2019 00:19:17 -0400 Received: from ozlabs.org ([203.11.71.1]:39567 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725854AbfH3ETQ (ORCPT ); Fri, 30 Aug 2019 00:19:16 -0400 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 46KR7h2fpxz9sN6; Fri, 30 Aug 2019 14:19:11 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1567138752; bh=Y28Rt2oHTcK3rAJXH2EwjpFaRwubHNhkaQ77jcR6V2M=; h=Date:From:To:Cc:Subject:From; b=TCO8AFFb3Js4ZpiaaRix1u3cV4IboctQreVNI5hQlP4K8/o+1ajakWCJVFdbHC8BF yWx3qY/bNEi4OzgOdK19jy6SF4InWSXZQ1zYiBEV7XUfDicb3vGhCJSUogKmJXKzoe uWVQg9YSKWFKPeAoz8dXGghpOVklfcvzLj5jIjk1q3NmYT6XmhmIP/ng+BHxIHTdT+ 1rPTY+J3yYnPGH+C3LU1rW9gmLvIjaf8A0yH5fMpxYKrxNKG/fpoMOJzdzCnKz2Uci Lxq6WHkc/wTTac8LEBaNVUqmFWdAzn3tmwlHxzJOw+ox7kONMHYUKvPcN/O2qVWWAX Zlueh1hrGxhqQ== Date: Fri, 30 Aug 2019 14:19:09 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Hayes Wang Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20190830141909.5f15665b@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org 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/usb/r8152.c between commits: 49d4b14113ca ("Revert "r8152: napi hangup fix after disconnect"") 973dc6cfc0e2 ("r8152: remove calling netif_napi_del") from the net tree and commit: d2187f8e4454 ("r8152: divide the tx and rx bottom functions") 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/usb/r8152.c index 04137ac373b0,c6fa0c17c13d..000000000000 --- a/drivers/net/usb/r8152.c