| Message ID | 20240213110852.51524899@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-62559-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id
dn10csp239197dyb;
Mon, 12 Feb 2024 16:09:25 -0800 (PST)
X-Forwarded-Encrypted: i=3;
AJvYcCXeVT+dJrRpTYucHaRHqjlIjNietQ5hqMaBpV3ccaio68FEMR6z7K5xUC0kHA/tY/C519mcKiy5c0OJCJOV5EMHAbgrEw==
X-Google-Smtp-Source:
AGHT+IE/JvVSUpRq2iMok2UCZyVY8YRApCEPXJhByV6r9je0JQBsEcxJtmbEVOUoSOYksW1Jy3Az
X-Received: by 2002:aa7:8714:0:b0:6e0:a026:913 with SMTP id
b20-20020aa78714000000b006e0a0260913mr7660809pfo.12.1707782964993;
Mon, 12 Feb 2024 16:09:24 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1707782964; cv=pass;
d=google.com; s=arc-20160816;
b=xhxo4db+KHnWPjVBc3QZIgtvsGWnEOhVW0EKAX+BZU5CKKeYiPGSKBtMXMGTtE90oA
MXAR/FRMlOwAQc8MlSEpPLsDPNIWFmEBxA3NlfpP2DMpBsrRpZBitK+cJarZD8BKHo7Q
U5h+hQo/XF9JygyP6TxuyfngOIiz0unWXSmnf3bwWN7MDvRvlgVVLtDmkeP6j4n6YZae
FhHniqIT03GQL0RYsMn07GkOeH4jKBUz2BEImlzEomno3wg/VIjsQfgLHwkqqGC6dLwf
8LF0cEQ+Z/VlUa3HkBaZclaPsYVV2gTRPcsixchOJsJAhr9fKMmVW7oi3Px20FIeyUPg
ihwg==
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence
:message-id:subject:cc:to:from:date:dkim-signature;
bh=2nfZYxxE+1dxFM4SEfJqpgzynVkamsIwAnSU0lPVsxA=;
fh=G1IbRn3RUYALaEOlkV5AsW5ghJ8PD2YysBaXa+H1+wo=;
b=d31BnSiMR/sRk7o2Qgm+UXkhMZG8ahsdKDos+BVKo6lAZ7UjeXL+YKfqi1o0wdLv2B
vg6X4P7vbYuGoCT1O/Mk5O6hBKL4AVHxHjJ4614u4TOYoMb/CA6jwP4Q86/7g8ZfajVg
pyJtreDbV/aZRsYn43AMmFDeLOOi616LqiP+9QTxhFi0xLK4z/e1CB7s+5chTwG/sRXc
OYzYzdIOE66E2TBQCZZgtULlnKMAoZ2eZ0789ji9Y7oL7jjQaCTc3TGFrNVPUMUlQdIW
Y4S3f07ZqrJUXEqiGvzGvQc+IV36bs6ssiqUkdBtI/r+8cjh49apAdXWXdu6Td1sSLwR
+pkQ==;
dara=google.com
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=rKD1zx+U;
arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass
dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au);
spf=pass (google.com: domain of
linux-kernel+bounces-62559-ouuuleilei=gmail.com@vger.kernel.org designates
139.178.88.99 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-62559-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
X-Forwarded-Encrypted: i=2;
AJvYcCU401ygp1Rnw/qDGAJEjZiWokc+6iBsnabxFwNvLmUBj2jQz2P/QDeAskXVFlGt+85dR1om0CDRrviZu/09mLGfeZ7soA==
Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99])
by mx.google.com with ESMTPS id
p24-20020a62ab18000000b006e0949b2543si5684204pff.342.2024.02.12.16.09.24
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 12 Feb 2024 16:09:24 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-62559-ouuuleilei=gmail.com@vger.kernel.org designates
139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=rKD1zx+U;
arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass
dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au);
spf=pass (google.com: domain of
linux-kernel+bounces-62559-ouuuleilei=gmail.com@vger.kernel.org designates
139.178.88.99 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-62559-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org
[52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by sv.mirrors.kernel.org (Postfix) with ESMTPS id 98CC3285A6F
for <ouuuleilei@gmail.com>; Tue, 13 Feb 2024 00:09:23 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id B039815B7;
Tue, 13 Feb 2024 00:09:07 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b="rKD1zx+U"
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C6EC621;
Tue, 13 Feb 2024 00:08:59 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=150.107.74.76
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1707782944; cv=none;
b=M6C/89E4EzoAiUppw28JyH1Ng8q/OGXZG2eWgW+YVPsN53y5aeciCfDYzMcXUG2gZZUCfNvbVgWYMbkyGmWc69VnFP/qHeYouyosdZWDuppyspzuC9dfCRyrpOiwhAHidd9r4ElOqmY9L2eNFUkSw8k4rR1SepeNnOJjgymvhcE=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1707782944; c=relaxed/simple;
bh=RvflJdzl0Jc9vk19OoqP+WEbH4d8Gr0XXL8NXNFQ/K8=;
h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type;
b=D6GiuSarat+MOoQcbyLtrJPOa2C/r+9vZIWCU3YgJROaqVMcupwcc4FfMZbo1+CABra7lLohFqJzsXFfnBW6rT7/vJgLxAypOl/nHQ6GhD/duuNcoM75UIiS2mJBDdczbBukaGvI6K8z94Q+vxKVRtuKll6HaH2tLmL5noOtyao=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au;
spf=pass smtp.mailfrom=canb.auug.org.au;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b=rKD1zx+U; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=canb.auug.org.au
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1707782937;
bh=2nfZYxxE+1dxFM4SEfJqpgzynVkamsIwAnSU0lPVsxA=;
h=Date:From:To:Cc:Subject:From;
b=rKD1zx+UkYmZLwgLYJzKgJX8nSyoUSWu8e1drAjJeEOUNgi11aawinhW6EqKhFT4m
xrpmEFOtQnhn0uR5m4NG/oBFTHKrX0HZzce2KU4oIDMgoIRV1SvvyggASWABf2NZDc
3gAKsGyPTRbixP4ZL0BTJ1j3x0+Bw8tZuwM3Pw9jlu12MM533RGlx4uG+8a32WeqT6
WB3TuMj+ZIP4zahJPaX1iBBcFEa2U9sTz+uASPlD2vPv4JjUS6ey0+SW9zSPTiE9HU
jq+RNsGzZhhn4X26uPXS6CywO+k+wcby20VAzwGAV00sLYeAsxAbbqFjTNP1kYFZ7J
7r6B9UkJ/SZpw==
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 X25519 server-signature RSA-PSS (4096 bits) server-digest
SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4TYhWW3hXWz4wcp;
Tue, 13 Feb 2024 11:08:54 +1100 (AEDT)
Date: Tue, 13 Feb 2024 11:08:52 +1100
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>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Johannes Berg <johannes.berg@intel.com>, Linux Kernel Mailing List
<linux-kernel@vger.kernel.org>, Linux Next Mailing List
<linux-next@vger.kernel.org>, Miri Korenblit
<miriam.rachel.korenblit@intel.com>, "Rafael J. Wysocki"
<rafael.j.wysocki@intel.com>
Subject: linux-next: manual merge of the wireless-next tree with the pm tree
Message-ID: <20240213110852.51524899@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/xWx+rnaTt=Lmy3hfd=gt658";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1790740230304560042
X-GMAIL-MSGID: 1790740230304560042
|
| Series |
linux-next: manual merge of the wireless-next tree with the pm tree
|
|
Commit Message
Stephen Rothwell
Feb. 13, 2024, 12:08 a.m. UTC
Hi all,
Today's linux-next merge of the wireless-next tree got a conflict in:
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
between commit:
2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_thermal_device")
from the pm tree and commit:
8cb3a308ceb1 ("wifi: iwlwifi: mvm: fix thermal kernel-doc")
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.
Comments
On Tue, 2024-02-13 at 11:08 +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the wireless-next tree got a conflict in: > > drivers/net/wireless/intel/iwlwifi/mvm/mvm.h > > between commit: > > 2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_thermal_device") > > from the pm tree and commit: > > 8cb3a308ceb1 ("wifi: iwlwifi: mvm: fix thermal kernel-doc") > > from the wireless-next tree. Hah, sorry about that. I told Rafael this was likely not going to conflict, but didn't see the doc changes ... I guess we'll have to live with this conflict, unless Rafael you have a feature branch for this I could pull in and resolve? johannes
On 2/13/2024 9:25 AM, Johannes Berg wrote: > On Tue, 2024-02-13 at 11:08 +1100, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the wireless-next tree got a conflict in: >> >> drivers/net/wireless/intel/iwlwifi/mvm/mvm.h >> >> between commit: >> >> 2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_thermal_device") >> >> from the pm tree and commit: >> >> 8cb3a308ceb1 ("wifi: iwlwifi: mvm: fix thermal kernel-doc") >> >> from the wireless-next tree. > Hah, sorry about that. I told Rafael this was likely not going to > conflict, but didn't see the doc changes ... > > I guess we'll have to live with this conflict, unless Rafael you have a > feature branch for this I could pull in and resolve? Well, not yet, but I can add one if that helps. Cheers!
On Tue, 2024-02-13 at 18:03 +0100, Wysocki, Rafael J wrote: > > > > > > 2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_thermal_device") > > > > > > from the pm tree > > I guess we'll have to live with this conflict, unless Rafael you have a > > feature branch for this I could pull in and resolve? > > Well, not yet, but I can add one if that helps. > Well if you have a branch that has the above commit and not too much else, then I could pull it into wireless ... but chances are the common base that we have is divergent enough that'd pull a whole bunch of other things into the tree so that'd not be great. Pretty sure even if the conflict survives to the end Linus could figure it out? :) johannes
On Tue, Feb 13, 2024 at 6:14 PM Johannes Berg <johannes@sipsolutions.net> wrote: > > On Tue, 2024-02-13 at 18:03 +0100, Wysocki, Rafael J wrote: > > > > > > > > 2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_thermal_device") > > > > > > > > from the pm tree > > > > I guess we'll have to live with this conflict, unless Rafael you have a > > > feature branch for this I could pull in and resolve? > > > > Well, not yet, but I can add one if that helps. > > > > Well if you have a branch that has the above commit and not too much > else, then I could pull it into wireless ... but chances are the common > base that we have is divergent enough that'd pull a whole bunch of other > things into the tree so that'd not be great. On top of 6.8-rc2, there are 3 unrelated commits that you'd need to merge along with the wireless ones. Your call. :-) > Pretty sure even if the conflict survives to the end Linus could figure > it out? :) Agreed.
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mvm.h index a618824f0b65,83263d510a45..000000000000 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h