| Message ID | 20230417143618.2091407-1-broonie@kernel.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2113476rwl;
Mon, 17 Apr 2023 07:55:25 -0700 (PDT)
X-Google-Smtp-Source:
AKy350YfncVISsaswTpsn6NXZuKPhQswW5p/VWDmPsjqLE+9NXScxxgon2PjpMTXaN7CqfYtOfvH
X-Received: by 2002:a05:6a00:2e09:b0:625:e051:e462 with SMTP id
fc9-20020a056a002e0900b00625e051e462mr24879489pfb.15.1681743324847;
Mon, 17 Apr 2023 07:55:24 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1681743324; cv=none;
d=google.com; s=arc-20160816;
b=D3MrTfG7Ssf7+sxc4NwRsnvuNCdqdJu/nk311kPkUQ2DpSkd1CcKKXe3EkzQ2C5bwI
lF/xQj813zavDUqS8yJY4fejRKDU0TDt9aylF5QKjRbcM8iGmJfjQ/2tU+G47vtV9uFl
ao1ZS7MwgCwKW85G3opx76MW4T2GrUhzCYH/0dPOMVvBDxttx4k8nYxgt50/+uSz8v4u
8jVz8LUrhN7Y0GVZJWQK2xM96tSCjXLnmFDmgJ8t9EI/wA8zpi1NXYa5hbAMgfhS0LSp
AZBe2lEAoF4iAth8TmlfM8yaSqIUZZko1QlQaPSuCLMGue4tMXZtnzOP93YNdZ8thbj0
gz2Q==
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
:message-id:date:subject:cc:to:from:dkim-signature;
bh=WGJ/7Lb59nQPdMIszoD0klwooaWOHurmc4QQxAU2l94=;
b=J9yCidFkg/OCRQzL8Q4Tonwehx4GTvxg+F8b85dF3odOuMhIg7qs5BLN7cQKVNqxQ6
E1E85OVY8MU/qZDleKEbC+rVNLyqIDGNujdQCp/VOnCaVp/MulB9YbK99rkJxwF+r655
KMe5J47S5r2pmSW5Ke3j9EuBacq4ydOwhfH4X0c8PqjpH66IgDyeWNNz0S9Nhxa9L5f/
nHBETIeucfys3mlIfHv8YzekV77umxh26n8waaXwtPK+QrSfU2AQRfm5CYogj5zp7NOA
t3V35uYj3K5jMQYkfeR6UX0qqhcvIXqWwweTo0fUuBmyJPa9P9WEbGdyufUIWbJIzqti
z6Bg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b="L/I7s1WW";
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
a17-20020aa79711000000b0063b57cc32b1si10560230pfg.344.2023.04.17.07.55.09;
Mon, 17 Apr 2023 07:55:24 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b="L/I7s1WW";
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229540AbjDQOgd (ORCPT <rfc822;leviz.kernel.dev@gmail.com>
+ 99 others); Mon, 17 Apr 2023 10:36:33 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60466 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229573AbjDQOgb (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 17 Apr 2023 10:36:31 -0400
Received: from dfw.source.kernel.org (dfw.source.kernel.org
[IPv6:2604:1380:4641:c500::1])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E4D1E8;
Mon, 17 Apr 2023 07:36:25 -0700 (PDT)
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by dfw.source.kernel.org (Postfix) with ESMTPS id DC2D862603;
Mon, 17 Apr 2023 14:36:24 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11CCFC433D2;
Mon, 17 Apr 2023 14:36:22 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1681742184;
bh=TJvJT+LSQXiURhDyuoQ3DL12SWV4O4BRIOvlEFEf2K4=;
h=From:To:Cc:Subject:Date:From;
b=L/I7s1WWi0EtlddLnCpSrOcdzC2/gyRjEFEHhikUmXtYD/yamH1Uc7qhimNw4CoyZ
1WJyokHwaqp50Y9ZLKFA7/iFJFxr9Yrjgn0aoAmi95/YGRKQie/OT799bd/fvHeQTa
FJjEHPpJD3/3mTOfC+/JOJ0rU9a1FgCc/G2yZaPpDOJmRhUGIpBRkEug5OG3ptLXLr
g+8M8QRzZ9zOMDqRuC/3HXOmOIEgUitf34T8Z4lzm/G6sZ9iHs6O9JYCQAfJ/Xs2uR
4wrwevW+ppjnLqnqZ+NWc+ZavrMAJmvzdNxILBM+3DzV0NWHRpw1z+bPZaXhSvJeOv
womyFuPRUTiKw==
From: broonie@kernel.org
To: Marcel Holtmann <marcel@holtmann.org>,
Johan Hedberg <johan.hedberg@gmail.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Subject: linux-next: manual merge of the bluetooth tree with the origin tree
Date: Mon, 17 Apr 2023 15:36:18 +0100
Message-Id: <20230417143618.2091407-1-broonie@kernel.org>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1763435688781718896?=
X-GMAIL-MSGID: =?utf-8?q?1763435688781718896?=
|
| Series |
linux-next: manual merge of the bluetooth tree with the origin tree
|
|
Commit Message
Mark Brown
April 17, 2023, 2:36 p.m. UTC
Hi all,
Today's linux-next merge of the bluetooth tree got a conflict in:
net/bluetooth/hci_conn.c
between commit:
5dc7d23e167e2 ("Bluetooth: hci_conn: Fix possible UAF")
from the origin tree and commit:
0623067085473 ("Bluetooth: hci_conn: Fix possible UAF")
from the bluetooth 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.
+++ b/net/bluetooth/hci_conn.c
diff --cc net/bluetooth/hci_conn.c index 8455ba141ee61,640b951bf40a1..0000000000000 --- a/net/bluetooth/hci_conn.c