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;
MIME-Version: 1.0
References: <20210819222307.242695-1-luiz.dentz@gmail.com> <20210820.124629.2213659775230733647.davem@davemloft.net>
In-Reply-To: <20210820.124629.2213659775230733647.davem@davemloft.net>
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date:   Fri, 20 Aug 2021 15:59:47 -0700
Message-ID: <CABBYNZ+N0d96GieMggHx+x2075cK5aswJpBua-wX2LA87LkgkQ@mail.gmail.com>
Subject: Re: pull request: bluetooth 2021-08-19
To:     David Miller <davem@davemloft.net>
Cc:     Jakub Kicinski <kuba@kernel.org>,
        "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>,
        "open list:NETWORKING [GENERAL]" <netdev@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Hi David,

On Fri, Aug 20, 2021 at 4:46 AM David Miller <davem@davemloft.net> wrote:
>
> From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
> 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.

My bad, I thought I had rebased it on top of net-next but perhaps I
didn't do it correctly, anyway the correct version would be the one
Linus had pushed to his tree so you could have just skipped the one we
had in bluetooth-next which was an early attempt to fix the same
issue.


-- 
Luiz Augusto von Dentz