Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1400184pxb; Fri, 20 Aug 2021 04:54:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjS0TlVzUlXzQgJM3nfmAvZRW55LRWhMjGm8B7tttY30g2qg6tV5oX/U8xIl+7gms6JU8h X-Received: by 2002:a05:6402:482:: with SMTP id k2mr22365520edv.188.1629460473385; Fri, 20 Aug 2021 04:54:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629460473; cv=none; d=google.com; s=arc-20160816; b=yAZNojQY3vaejs6VA80F1xZblqCdMeu/HOSVrLueY7pvQOmvWL62pcePYTVO2GBNBQ rqADhdp3ztPVyHAWpHsj9QXd2CxO6XLbV0EpQRRE1Ec/1ThhjKG0wt9SJtbRPCqrxP/t U6+jYMIITKo/1K8VlZ19bO6XG3MrBDsT4O/VLp0K9232BGaLy79kKbHWqVXN6aL+DJvi 9qtFNXCCLiEc2Fb2vHJ8o+uuJKMRiBWsL1I+D0B6RPJyzvqJaQLde+3xq/624muRRYEU JJAb5dZX00OCH5NTF12ks01JC00Gn+IB4B0iez2VykLk2pzPj5kmwBjaBLf0ZOUc6xxq J9AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:from:subject:cc:to:message-id:date; bh=f/kpUnqeyxrxeJn8DzQR8CsEMjT2ovgQARCzk+VGotg=; b=ZTLRuXS2X65oGZNaYveffnCjinfKmZ6kd7qKA3YlEbjZoUU4IcrLHgDd7YPrQtRkfz elsaomZIXUSAnTsjz3ew1btRrIQgXPSerVZMdB//xCW2U4usJbQG8L+vKdCj0MOtV32e ftcRVjRu+q543fr+GG7JTlun2C0BCx3xcIfVa3shLuFAqgiGO1eUqbSilL/zkzCCzr1x 5oPjh39cmG9Gz3vBtLR0dp6KyR6AYLseXVg6+/sc+M2F+iNh4/mJQceu2Kviiv2F2DTN LY24eTvXE8h2lbVjeztd70eSqF8m7o1wSiME4buQWwEdc2XjsA84d+a6x1MleZzfoR7l /E3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g24si6395893edj.498.2021.08.20.04.53.22; Fri, 20 Aug 2021 04:54:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239192AbhHTLrQ (ORCPT + 99 others); Fri, 20 Aug 2021 07:47:16 -0400 Received: from shards.monkeyblade.net ([23.128.96.9]:51044 "EHLO mail.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238496AbhHTLrP (ORCPT ); Fri, 20 Aug 2021 07:47:15 -0400 Received: from localhost (unknown [149.11.102.75]) by mail.monkeyblade.net (Postfix) with ESMTPSA id 839684D0F197C; Fri, 20 Aug 2021 04:46:34 -0700 (PDT) Date: Fri, 20 Aug 2021 12:46:29 +0100 (BST) Message-Id: <20210820.124629.2213659775230733647.davem@davemloft.net> To: luiz.dentz@gmail.com Cc: kuba@kernel.org, linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org Subject: Re: pull request: bluetooth 2021-08-19 From: David Miller In-Reply-To: <20210819222307.242695-1-luiz.dentz@gmail.com> References: <20210819222307.242695-1-luiz.dentz@gmail.com> X-Mailer: Mew version 6.8 on Emacs 27.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.2 (mail.monkeyblade.net [0.0.0.0]); Fri, 20 Aug 2021 04:46:35 -0700 (PDT) Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz Date: Thu, 19 Aug 2021 15:23:07 -0700 > The following changes since commit 4431531c482a2c05126caaa9fcc5053a4a5c495b: > > nfp: fix return statement in nfp_net_parse_meta() (2021-07-22 05:46:03 -0700) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git tags/for-net-next-2021-08-19 > There was a major merge conflict with the deferred hci cleanup fix that came in via 'net'. Please double check my conflict resolution. Thanks.