From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ED81BD37E3E for ; Wed, 14 Jan 2026 15:13:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pAMa8b+pnjmawngmNFoBkoxVHrQu9nmKZxAfyT5nEVA=; b=omsPD5dqR2twI2weJhtwgiBECn VKOL4w3cS2CRsDb3CQy4MXVWYVEc+UjpWs/MkjH/+WQIxAbTbMuXkWAMpMayfBQ04X0L5lLzmy1ud 3GDio1IYIrNCxgQKka7jtSJtitj/9tr7chhrcpsdLxP3jZiL3hl6NhNllHqbU5akrLaRZjTMcxXzL p6h5lHqglB0Zy7LjOtYyhiXA3dWzPCo03bTfIyqoPK9r+S2hFbwsKEA383Dz8/RgKr3IuiisiXiBK ZfBW27ADwLaHB9BLr0gzUFkt5CR18K9d9bGMdIunnwUXJJ7g1XByplzocOmss69NdE2DhKYEI8TnV XMfR1MpA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vg2ZD-00000009dhS-2r7s; Wed, 14 Jan 2026 15:13:51 +0000 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vg2ZA-00000009dg5-3m5g for ath12k@lists.infradead.org; Wed, 14 Jan 2026 15:13:50 +0000 Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60EB2aOq3416172 for ; Wed, 14 Jan 2026 15:13:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= pAMa8b+pnjmawngmNFoBkoxVHrQu9nmKZxAfyT5nEVA=; b=OfkRh90kkBzRfjB+ TrHiZFodm1rMkrXeNAe/ZRfl9nFCqMA5x+w/OX/j9VXzxw3adUx7fFNkIA7vOGK8 RwhDH/YsnVp5vrI/DQftnHelkAugA8RBHCNOndO1ddcdil0aZn2HTxZKmAMWZs7q M4Fhw7y6dY9bn1yd0VHoBi2VjFBImsQ2XU+D25h2zbuHvD3cF1ncnurPxy69kLRU FHHQg771egZN4ShHvv1aHismkVJewuV2BDumqxguDgjcJPjxnSfAe1UBxEQAPkoD ahuKOtzaJXE1QEz1+WLMbouiAZpXHL2nDuREMaHU69omPmhVnUi3ZyOfatN+ZXd1 UfT2nQ== Received: from mail-dy1-f197.google.com (mail-dy1-f197.google.com [74.125.82.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bp9x2gr6n-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 14 Jan 2026 15:13:48 +0000 (GMT) Received: by mail-dy1-f197.google.com with SMTP id 5a478bee46e88-2ae25c02e7bso30943577eec.0 for ; Wed, 14 Jan 2026 07:13:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768403627; x=1769008427; darn=lists.infradead.org; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=pAMa8b+pnjmawngmNFoBkoxVHrQu9nmKZxAfyT5nEVA=; b=Jqetkn8FD2yb/MRqCffUtJgGNxeKcvLU1ncGX6BQ4AC6uHvKS41ZQdk/hGuO/q50e3 PglaAEYjyOViTN9UKurJvOefE2uEiQDshlRqck6y9czw17vMP0WMHeaSUwSR+cR4X1yM DDHrZ7rXBUuuFGjZS8c8wSR/pUebT1+5+KYk1Xc3mIgm+MxLUzoOUases5tqEPBxStsT ytxqCbu6ONyhVmyIm7ifz2zRtEoStHMGvhH+JbmnjGGmQyfvkqo/9WtC+W/QljQv4sdW F6zlPdVfGNmEdVK9tw/OT4GOjAM9J+e53dVSauu4hWBcUPOVs1he3RgFpLwMDg65c4qM JKFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768403627; x=1769008427; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pAMa8b+pnjmawngmNFoBkoxVHrQu9nmKZxAfyT5nEVA=; b=sOba3IM9/NAfSTjspL63Y4vWof4x0OnxCGceOAsYa3S+7+ooteLNRtsxFK4fUvej1i ag+Hfp7MkPMhEUX4M2U1vt3ikke6kO4Bpv6cV+JDDfWTEnKyuq+zDWLNaLsYqBQ2A30G 0WKJBLtNudMyC1T8djFEp6BXdF9lv37OBkWTKy5q8noZwtC99CWxUR+L/BrsYxnFl1tH ifzFcvjHKqQy0Gd5acddHqhmqM2PGEY3OFlLlYLCXLZw0ZiUzMUQXMcnSctCItfHOcn/ e+bNqib96xh8GGBNRiCpq5QJCuhsIWddwAg5irbGhytTBX7dSH7C8icI6Be5eDL+YEJe e4Iw== X-Forwarded-Encrypted: i=1; AJvYcCXyEUsormmQ0Zgy08en8daNRZpEsae/YwLEtsb+6zXiltXaT82gBSqP0jEQf4xflUetUG2T5dA=@lists.infradead.org X-Gm-Message-State: AOJu0YxTpebciVembC8KcUVlSKWR9JvoEAlfySxa4AIOKO69bYTTuDAd NgO9UYvWV++LYOD+4MqDfXQ5HDGP4oPmmEmH7EpKRrY/4Ko+iwKIpU7XemQYHpvMoJH0FvNCOLl NapWDQDG+izw7ImtkXIqYg92J2cq7P3LMEdssqzI02ZM7GyZ3WBFB4Za5jBRhAkhl X-Gm-Gg: AY/fxX5UJkA7+RWVzCKU6XJq/s4W1S0aqROKcALjeoh4VrZIP12QyFgsSg9c4q921AP AXPT6zldSZOfbIEm+K30qrEqSiN1SgZYJWmbjtBiojOEvopsuZ7oDlQLdRqLIojJzpQnjC7wF6B Ibhn5EVFoJPmLPq04QXnCfFO6pZ20gqi2QdtqtrY/2YyetyZkHodFbGkXAnh9B7s5geO49dw5py 8Y+XkHbKwhG5ScrpdhNo6HnenGL4n1p84Bt1FsiuFmMjRfMUQ7+LmHVu89bmiyHe0d6EP48Aed0 /Vm6lQpH//fP7LbtOkMCtAUKU7MsFjsEFLVud73yABP5gUP1ZfTxpUMXt5VrEO2UxUlSyZYLROH +Ov2H34zzsTD19cEosCBJemRXu1eeYuljUUkhEsQEv65DkfM2ZIJKo8PYlH3gY1+lvtuBrg== X-Received: by 2002:a05:7300:23ce:b0:2ae:2c27:fc0e with SMTP id 5a478bee46e88-2b4870bd16fmr4248647eec.22.1768403627341; Wed, 14 Jan 2026 07:13:47 -0800 (PST) X-Received: by 2002:a05:7300:23ce:b0:2ae:2c27:fc0e with SMTP id 5a478bee46e88-2b4870bd16fmr4248586eec.22.1768403626617; Wed, 14 Jan 2026 07:13:46 -0800 (PST) Received: from [10.227.110.203] (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b175bee31dsm17962169eec.32.2026.01.14.07.13.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 14 Jan 2026 07:13:46 -0800 (PST) Message-ID: Date: Wed, 14 Jan 2026 07:13:45 -0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: pull-request: ath-current-20260113 To: Johannes Berg , linux-wireless@vger.kernel.org Cc: ath10k@lists.infradead.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, jjohnson@kernel.org References: <98386125-c0bb-495e-b2ba-2765aaed19d8@oss.qualcomm.com> <33d998cc225a7aeef4731ebc53c28a32b241ca7e.camel@sipsolutions.net> From: Jeff Johnson Content-Language: en-US In-Reply-To: <33d998cc225a7aeef4731ebc53c28a32b241ca7e.camel@sipsolutions.net> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Proofpoint-ORIG-GUID: p9EzzIeNuvvf8KSZOGyvGEUiev9wc9Qb X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE0MDEyNyBTYWx0ZWRfXyzUIltMOvTMF lRlLBLzLlUtog1ZNypLGUpHdLs+k2UHTfKzE7WcoHw9HjBL57jfMn1R7joNar+XTtEKM2+XfRuk JlTHw5Gza5aUiA02lcflnKTFPb3DzMa3Z4PAmGogZ1ceiCkpNdhbTnus9wPXHr29E2Q7bUhCXzg lfRqN1Ch5BAMqo9kpJGjzZ0TWeou/sLYyjyEqqUNu0LaGis29ithkpBLeV66UF+jwNEGFSRAQZV TsADaPnSs0ZOezi33RO9Z4ko0Vwn8rCvcWOVFgxm8LjZsQnjeKgAwczYEN5WQpU1FtQFJpfQ1c1 N46M/JBH2eBz9OleRQKdqVdyTjOcVEgA8TwNBGirvH3wp/Pi/LvTZ0EkoEKvXxhAJNj431ypHwg rtkh1Rr054D2CxX9qVKQp0Dsze/7R6Ta8UJF4F3K7paFCYA9UoB6z9/uHOkysiSSbxcQYvMMNha XkopKiLHI7DnT0yxj4w== X-Authority-Analysis: v=2.4 cv=Fr0IPmrq c=1 sm=1 tr=0 ts=6967b2ac cx=c_pps a=Uww141gWH0fZj/3QKPojxA==:117 a=JYp8KDb2vCoCEuGobkYCKw==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=s_ggy6vDphFXL1rJ9sYA:9 a=QEXdDO2ut3YA:10 a=PxkB5W3o20Ba91AHUih5:22 X-Proofpoint-GUID: p9EzzIeNuvvf8KSZOGyvGEUiev9wc9Qb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-14_04,2026-01-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 adultscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 bulkscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601140127 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260114_071348_977867_DE16188C X-CRM114-Status: GOOD ( 21.79 ) X-BeenThere: ath12k@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "ath12k" Errors-To: ath12k-bounces+ath12k=archiver.kernel.org@lists.infradead.org On 1/14/2026 1:47 AM, Johannes Berg wrote: > On Tue, 2026-01-13 at 09:33 -0800, Jeff Johnson wrote: >> >> Note to maintainers: >> >> This tag includes: >> 31707572108d ("wifi: ath12k: Fix wrong P2P device link id issue") >> >> That commit contains the following: >> >> Note to linux-next and netdev maintainers: > > I'm a bit on the fence about this, I hadn't thought about it on the > prior -next PR much, but I feel like this is a process thing that > shouldn't get recorded in the tag for posterity? > > I do appreciate the inclusion of this (*especially* when I won't notice > the merge conflict myself), but I tend to think it should be in the > email rather than the tag message, since the latter is something I use > for the merge commit message and it gets recorded. > > Either way I have to preserve it manually to the next level, so it > doesn't really help all that much, although I guess in the tag there's a > chance I could see it again when preparing my PR. > > I'll just edit it out this time I think since it's so long, but you can > complain and convince me otherwise for the next time ;-) In retrospect I made one bad decision. I modified the commit text of that patch in my "pending" branch to add the conflict resolution information. Instead of that, I should have reposted the "pending" version with that conflict resolution embedded in the "basement" of the patch so that then it would be part of the email record on lore but not part of the patch record in git. And then for the tag I could have referred to that lore link in the PR email. So this was a good learning lesson for me. Hopefully these merge conflicts will be much fewer once the refactored ath12k lands in Linus' tree in the next merge window. /jeff