From: Greg KH <gregkh@linuxfoundation.org>
To: "Hans-Christian Egtvedt (hegtvedt)" <hegtvedt@cisco.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Luiz Augusto von Dentz <luiz.von.dentz@intel.com>,
Marcel Holtmann <marcel@holtmann.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: [v4.4/bluetooth PATCH 1/3] Bluetooth: Consolidate encryption handling in hci_encrypt_cfm
Date: Fri, 16 Oct 2020 09:54:55 +0200 [thread overview]
Message-ID: <20201016075455.GA1354412@kroah.com> (raw)
In-Reply-To: <41626257-e150-e2dd-c6f2-ad586ec94c14@cisco.com>
On Fri, Oct 16, 2020 at 07:46:39AM +0000, Hans-Christian Egtvedt (hegtvedt) wrote:
> On 16/10/2020 09:32, Greg KH wrote:
> > On Thu, Oct 15, 2020 at 11:12:23PM +0200, Hans-Christian Noren Egtvedt wrote:
> >> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> >>
> >> This makes hci_encrypt_cfm calls hci_connect_cfm in case the connection
> >> state is BT_CONFIG so callers don't have to check the state.
> >>
> >> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> >> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
> >> (cherry picked from commit 3ca44c16b0dcc764b641ee4ac226909f5c421aa3)
> >> Cc: stable@vger.kernel.org # 4.4
> >> ---
> >> include/net/bluetooth/hci_core.h | 20 ++++++++++++++++++--
> >> net/bluetooth/hci_event.c | 28 +++-------------------------
> >> 2 files changed, 21 insertions(+), 27 deletions(-)
> >
> > What differs here from the other patch series you sent? Looks the same
> > to me...
>
> Patch 1 and 2 in this series is identical, patch 3/3 is adjusted to
> resolve a conflict. Sorry I did not make that clearer.
No problem, thanks for confirming this, that makes me feel better that I
didn't miss anything.
greg k-h
prev parent reply other threads:[~2020-10-16 7:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 21:12 Hans-Christian Noren Egtvedt
2020-10-15 21:12 ` [v4.4/bluetooth PATCH 2/3] Bluetooth: Fix update of connection state in `hci_encrypt_cfm` Hans-Christian Noren Egtvedt
2020-10-15 21:12 ` [v4.4/bluetooth PATCH 3/3] Bluetooth: Disconnect if E0 is used for Level 4 Hans-Christian Noren Egtvedt
2020-10-16 7:32 ` [v4.4/bluetooth PATCH 1/3] Bluetooth: Consolidate encryption handling in hci_encrypt_cfm Greg KH
2020-10-16 7:46 ` Hans-Christian Egtvedt (hegtvedt)
2020-10-16 7:54 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201016075455.GA1354412@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=hegtvedt@cisco.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luiz.von.dentz@intel.com \
--cc=marcel@holtmann.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®