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.de...@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.de...@intel.com> >> Signed-off-by: Marcel Holtmann <mar...@holtmann.org> >> (cherry picked from commit 3ca44c16b0dcc764b641ee4ac226909f5c421aa3) >> Cc: sta...@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. -- Best regards, Hans-Christian Noren Egtvedt
pEpkey.asc
Description: pEpkey.asc
