| Message ID | 20230914102830.00537203@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp138954vqi;
Wed, 13 Sep 2023 23:05:06 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IEU4g5VoIqRCJPCEFeyH0zCJzM17+h7G1uMToDEauuIanDQ7gSEBhHzRQoku0DLaQL/2dmu
X-Received: by 2002:a81:9c10:0:b0:592:a65d:387c with SMTP id
m16-20020a819c10000000b00592a65d387cmr3730464ywa.52.1694671506111;
Wed, 13 Sep 2023 23:05:06 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1694671506; cv=none;
d=google.com; s=arc-20160816;
b=LiDczRV50UIJQIwYoqy9OPRfg7hQ0uwHsE89+ff8Ooq/7jCzT85r7z+XSArp/+zJ77
TtQAk5Z152ZpjrhnQSXrWK5uqSIdE+J9lcjEM14QME3weJIt+VUBIbWWfcRnb4raYzIH
83T3ELVFJufqbBxu3jxC2nh2YuYPc5Kb9u/Me16pHx0AI+w3/UpyJyXAXVJTJXIa0rnI
50JcqI5YHPxUNPtIb8cf+eNXw2OOd1eBl4/KbESTeF4uPl7M0lRi/5jAQV7FSwCuYXk8
ZBI4etMumxMoYHx//bLMuMRPfwVMvxPzlaiXnCKmDwiPJH2ssJ39xsgWqIoSPx5bsxuC
3UQw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date
:dkim-signature;
bh=e1YoH197EdDGHpCVZmCs5PD+GAzKVkGxdxV3Lv5LF4k=;
fh=aCzD9iXwpbON9NyDsx/YdsJjRNvnc2RNbf/QjgRAgW8=;
b=d4v9yT7tTXTXoA/qz8w3TY0SZvCKey5iufeas+LJB0/rH7APtYLhA17Y9QbnKoaQX2
wCDgt0lqh515LIxCQZ0RXKPMufqxsp6VCxflK6U10pBq5wSN9I+fXAxD1iG8HmlL24RW
NGX7fOBeVIJc6kGFItIZC/rD10jsk7F8Q1Rs/V1pbKJ9rO/DdrDg08cMUmXPgnaY7UID
5MM0Q3CJO9cO0RFhXFOLsUwC3WE+UJPCQRWNREIkWgWmcQwaMTWq1Ruwf/AIpQ7H0oif
k/B/2to9iRrWgH3oR/DC6Zt4fIZWWHQnCH7DWkEY7tv1w7dd2JFqxwxrVj2WuU7BNtNv
h3sA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702
header.b="oFWDr//j";
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4])
by mx.google.com with ESMTPS id
e3-20020a636903000000b0056357813fc2si780311pgc.183.2023.09.13.23.05.05
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 13 Sep 2023 23:05:06 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 as permitted sender)
client-ip=2620:137:e000::3:4;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702
header.b="oFWDr//j";
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by howler.vger.email (Postfix) with ESMTP id B93CA822779F;
Wed, 13 Sep 2023 17:28:42 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S232885AbjINA2m (ORCPT <rfc822;chrisfriedt@gmail.com>
+ 35 others); Wed, 13 Sep 2023 20:28:42 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36012 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229485AbjINA2k (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 13 Sep 2023 20:28:40 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D10B5E69;
Wed, 13 Sep 2023 17:28:35 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1694651314;
bh=e1YoH197EdDGHpCVZmCs5PD+GAzKVkGxdxV3Lv5LF4k=;
h=Date:From:To:Cc:Subject:From;
b=oFWDr//j/nAazXnSMZxu8aZFoDRNaCdP3K+lg6fK0RvD3WoSKuFOkzb3Q4XlY35Xl
7KPFbRtKuQKy9r9CuuAzx/Xfgm4s/VS3jN2SXF7L1nXbpI/BE2VS63DO8LGttICDig
MH7rsrk+wc6u9ZU5yiS2L4pkg1yh6Cqss3216bIXVfE5HX12Affn+YksCP4kjgBir8
hdmAJAwdlejvrkxzH456RmINyS5odCyber8eOe85H1zFyq2laCh1Yt/I8XWZlly6z/
eh1gsBuucL51UtDGqjQSyw7yjlwEkATEnhjeR+vS76YOYdONUH+WZAhN0oQOW7Bkkt
v5OF3+aqyk3TA==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4RmJ8J4cDnz4wxf;
Thu, 14 Sep 2023 10:28:32 +1000 (AEST)
Date: Thu, 14 Sep 2023 10:28:30 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@kernel.org>,
Johannes Berg <johannes@sipsolutions.net>,
Wireless <linux-wireless@vger.kernel.org>
Cc: Aloka Dixit <quic_alokad@quicinc.com>,
Franziska Naepelt <franziska.naepelt@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Johannes Berg <johannes.berg@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the wireless-next tree with Linus' tree
Message-ID: <20230914102830.00537203@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/5WOeVV/K_dvnbDjNnTl9w+j";
protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]);
Wed, 13 Sep 2023 17:28:42 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1776991869311571662
X-GMAIL-MSGID: 1776991869311571662
|
| Series |
linux-next: manual merge of the wireless-next tree with Linus' tree
|
|
Commit Message
Stephen Rothwell
Sept. 14, 2023, 12:28 a.m. UTC
Hi all,
Today's linux-next merge of the wireless-next tree got a conflict in:
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
between commit:
1d85bb7fd66a ("staging: rtl8723bs: Fix alignment open parenthesis")
from Linus' tree and commit:
66f85d57b710 ("wifi: cfg80211: modify prototype for change_beacon")
from the wireless-next 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.
diff --cc drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c index af155fca39b8,5ddc2d9a6060..000000000000 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c