From patchwork Thu Sep 12 16:19:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1161671 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="dlAyYQmu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46TkWC03yhz9sNF for ; Fri, 13 Sep 2019 02:19:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732594AbfILQTm (ORCPT ); Thu, 12 Sep 2019 12:19:42 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:50069 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725972AbfILQTl (ORCPT ); Thu, 12 Sep 2019 12:19:41 -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 46TkVs6hnCz9s4Y; Fri, 13 Sep 2019 02:19:32 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1568305178; bh=/2FPKAkeV/GqFBXmtJHyD6OTSwjC5DdIye1DxxJG+bU=; h=Date:From:To:Cc:Subject:From; b=dlAyYQmu6QIeoRsXsY2UiWSCjojsWozTt+7JZk9Qz5peGumGPklYw5WM8Ecujlegj GHkdCoaNsKHR6bbWJlh/cN4OIR0wVNkfr+aMCkd8nlZlwASLViCy8Ub+NlmvgddqpG JUs1qETiufPI9b30kMF/bbDy0z7dQBCHp14glZG6BsczknnOjOUkjYlRszMQRivjKC 5WvKv6Zi0Sr4yxB6I8MhYZTo+QfmvPMMFnR3c/sUyXX/WbANWfULBArjWvcW7q9aMC DAUaW7WxcMe20QjjeOkHkVy/NRBqN+RRo0IM/JKxmvNv3J7Ffl7T2OCIyWBymNa4u6 P2qg5sM0mI4oA== Date: Fri, 13 Sep 2019 02:19:34 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Mario Limonciello , Marcel Holtmann , Alex Lu Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20190913021934.42fc0fea@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/bluetooth/btusb.c between commit: 1ffdb51f28e8 ("Revert "Bluetooth: btusb: driver to enable the usb-wakeup feature"") from the net tree and commit: 9e45524a0111 ("Bluetooth: btusb: Fix suspend issue for Realtek devices") 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/bluetooth/btusb.c index ba4149054304,ed455de598ea..000000000000 --- a/drivers/bluetooth/btusb.c