From patchwork Thu Oct 24 00:55:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 839028 Received: from mail.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 430B81BC41; Thu, 24 Oct 2024 00:55:26 +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=1729731330; cv=none; b=XhmL3PCZDgJ3/IJdwBRok1DMj8P+fMM2WCU9Ujpaf6c6FmUqxAGDHaC5FmBDpIq32VKe2Kgzw7Qwu37Baz8/GxpAWip+2uy36eBzr/1cnuQ0pJQvFkrkiecQB2C55DPrqIlluXP6bn8OK7g7jZWrfDhbhVdM0e7fyFl7L6rbY6o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729731330; c=relaxed/simple; bh=ve7awyesf+L2FQP5aITjBG5N/MbRQhV2+bWQg/HIrv8=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=EjX6UjXuV/Lx8sxPrJpgn36AJRWtdnnW7Ic2ciJUDL/WzXn4K/c/imr/azaN0jWk9QTKOOU/UB2WyA65pbnCykGJTbnq4R02llbZ1QutDHJbSncqSeMxb6uByhWvXUv5/7a7KXrZlEegiv5WnPCXHBfjqQOStsOqZRXQ/qPiZY8= 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=J+KR9HM4; 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 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="J+KR9HM4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1729731323; bh=INF+v9OTMCWoYD6UjquXwU45gu5BOm53e7zA3Gi0bMs=; h=Date:From:To:Cc:Subject:From; b=J+KR9HM4l9G9vfJHh16cm82r+SpBc9Y7wer5O8GrQwIoP6qE/12iiB1lP//H9yeS/ xUsQf2fjWQd1htwTquciIwp7xtL1HyC77PxTMIKWooZcfzMSifGjCfDMRcQCw92Qjb 2J94IXVOknnBDBQ/NO1TZyEeW5xoRw+TXJOxSddHMsgfXzgCwcRvaBARZr+TQUAwKl z2NAm5YhV7RSm6CkDffxtOBVF4jqj5Cs0EYX23qezETt/G1+UcBUNkTgJHZrHBo01u 6Ke2cKV4a18Hd+whwVWAsw//Bu3MJByclkswVof7XVlMrkBcnZx+H311eAcHBIf4Hq KdBSEvSaS+AsQ== 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) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4XYnWt5xmYz4w2R; Thu, 24 Oct 2024 11:55:22 +1100 (AEDT) Date: Thu, 24 Oct 2024 11:55:23 +1100 From: Stephen Rothwell To: Kalle Valo , Johannes Berg Cc: Ben Greear , Emmanuel Grumbach , Johannes Berg , Wireless , Linux Kernel Mailing List , Linux Next Mailing List , Miri Korenblit Subject: linux-next: manual merge of the wireless-next tree with the wireless tree Message-ID: <20241024115523.4cd35dde@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the wireless-next tree got a conflict in: net/mac80211/cfg.c between commit: 8dd0498983ee ("wifi: mac80211: Fix setting txpower with emulate_chanctx") from the wireless tree and commit: c4382d5ca1af ("wifi: mac80211: update the right link for tx power") 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 net/mac80211/cfg.c index 6dfc61a9acd4,6c0b228523cb..000000000000 --- a/net/mac80211/cfg.c