From patchwork Thu Feb 8 23:56:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 771826 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 4E5784F1EE; Thu, 8 Feb 2024 23:56:16 +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=1707436580; cv=none; b=F/QNElg5nG0c59wwj0eW8idV6BF8nQKxmHPjoZRkr0yS7KxNz0tYxZu09NOCasEepoTrqNKa9YPp60p/2ogjN3JwzYEOlBPne0atnlg5QeaoYpwwsksRwML5Nswkr4XnBzdhEpi8JYBU4I1HOKsSkxbRNUfzutaQHYUg2zSU5x4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707436580; c=relaxed/simple; bh=p0GgrDVddXy5cinEKXWSu6CMVmd6nvI+TEu518DlJKQ=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=X878rUIm9Jd4wunSqd9gLO9WXJ6uk5+kA6eCabzecJuLs/9brIBYBcKxJqVYFZee46/UCbVGbt0D4pJI/g3AcPUVmRwl8KjnrGR7yY8e3SiuJwiwF8TKTFLg0hh0nS0CkRCstR9sUQJEwOEKJioCprLapU8SciLYocvlmPK+Onc= 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=o5Z+jDJP; 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="o5Z+jDJP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1707436568; bh=JF9u5Fa1dVmcPt1ipcp/lcqbXM8SZnozmRqVtHfvw4U=; h=Date:From:To:Cc:Subject:From; b=o5Z+jDJPWJort99XiG8EnaY7WEPAiq3GppygibjGCjC6w3iumm8CTEf6uQqNbD3Gn ixlyp78qdAQDazg3mVQRV1k/5IJol+C4UO9znqOe1M9FNly3Zm1kCeMtU/v1rnnqkl tuT8gAIXo8wod4gfBd2Dimx0KWry39lrL9HFxzGRuQCkCufEH7u//qVEVpBW4T41gE 8FfsrYhJoWfP21sJkosctKYd7DMhcBQ362q9wrSxEJIr1Of5N6xJcobUrLiC7ZfUz1 oOQVDVGQ1X4kr9dg4dpgtTfJqx/HDCpb46Y1R356IVz15QEm1V8L1ssDkfbu5B4wCf 5lgYh3PZpzHgA== 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 4TWDQb0Qcgz4x04; Fri, 9 Feb 2024 10:56:07 +1100 (AEDT) Date: Fri, 9 Feb 2024 10:56:06 +1100 From: Stephen Rothwell To: Kalle Valo , Johannes Berg Cc: Wireless , Daniel Gabay , Johannes Berg , 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: <20240209105606.66e7808b@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: drivers/net/wireless/intel/iwlwifi/mvm/tx.c between commit: 2e57b77583ca ("wifi: iwlwifi: mvm: use correct address 3 in A-MSDU") from the wireless tree and commit: 3d869feacb74 ("wifi: iwlwifi: mvm: use FW rate for non-data only on new devices") 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/net/wireless/intel/iwlwifi/mvm/tx.c index 461f26d9214e,4981bb1f0251..000000000000 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c