From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 D363847DD74 for ; Tue, 18 Aug 2026 16:40:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787071207; cv=none; b=hRV+/0TgAltTcKHiru2y6T1Ff03hnwH5SliR9xqi2FDNxxuC6DL/P1niGq1Lel7T11BJnkSTmtRiiv6l0qPNgNkgKvF6LSsMbLyekhhnk24v2m5BLI3EkA+mO25Ov2+aY8dWErqI9TkpW+Q6/nDsaUKHIvILN0GNbEZBK7n+AbU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787071207; c=relaxed/simple; bh=LxXM6f8LvRMRdaBDCJgDddGoTAOWqIikLb7ZtyoSRlY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=TGCTLHeulE28mSbO6qWT/5PGb2Rpqo7DX1V2PrlHr63ZQdoXd1wnHyG+1QyMqMJDqo1WSY4YNM98ONWeON4jUaYzohzBu/DkYcYjkzJSFFyPyEZnLJmeDaNdPKvIfztw2FkRURlXbkPNpV9i6b3gml3bjQ5RpUuZ1QIsZNivySc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=V+9MxNxX; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=s4RZnbO+; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="V+9MxNxX"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="s4RZnbO+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787071205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2qGVQoiDTEX6X4G/Zfh7d+QhMF+J7FSivQNa20/i5U8=; b=V+9MxNxXtK7q3dk4SKWw31GwhX8xRMLft7JyAc0ibKioKsfQuHP+h7tmQbSLa+aci9tj8e oQUs+GBJaFjoFVcrWCWJrATCoEAnHyWYZMMuyrD4TEsN+lsTgmzhzzN2zpk2VplN4GtukQ eo4noRNsLWFJ40uPrDJXf8E3tY6hSKA= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-610-Lup4tIFCPx-Ogv2sb46qyg-1; Tue, 18 Aug 2026 12:39:58 -0400 X-MC-Unique: Lup4tIFCPx-Ogv2sb46qyg-1 X-Mimecast-MFC-AGG-ID: Lup4tIFCPx-Ogv2sb46qyg_1787071198 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4955843c6cdso288405e9.1 for ; Tue, 18 Aug 2026 09:39:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787071197; x=1787675997; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to :content-type; bh=2qGVQoiDTEX6X4G/Zfh7d+QhMF+J7FSivQNa20/i5U8=; b=s4RZnbO+vv0IoQsnW8fsrriq1Hn/W3XbPQiNee1GKNzJ6HCWFf/dozRyaidTLFInk2 jMllps55Y0KsOBcaUapxRyOMgyxG+mjbmOxFGrvWXCWFxMVCC2ODvp3JlgqqdhKNORAU r1m8BX7hmWUOiI6T6RVWzjLw5AAr0cGOVEnPiZW8Dg3X3Oo5ZKWSr8DtFfp9ECNATvT3 NO+Wx0olxUlomvFp+agrc+gjM0zCyE3B1WznZOihA6c52d+/9B9EBlhvPsbnGwhIXSQN 0yMdhUo71g5ev1wONWxRyhp1I4bQRorBipLF/U3BJE1uru4M/rPjaLDtgn/ufxkb40gf Nlwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787071197; x=1787675997; h=content-transfer-encoding:content-type:in-reply-to:from :content-language: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:content-type; bh=2qGVQoiDTEX6X4G/Zfh7d+QhMF+J7FSivQNa20/i5U8=; b=IXXH30XgqM9DXqEtKDaRGLTGn0svpScFyDpJKd/0umxUFsxOp8ffYBBOi2cSg9eb51 F3FYX8MVZtHuItL/lOIAgKkyKYBA5EFxirlBQxIpRQpmLpEABVQ0GYy6UgSUy7Po9VnA QN6BJFgnkISpTim6cHVEby/7htZG4/rEsmuNzsHbAfnqyTBbVLsY63fbuQbR3mSnCzx1 A/12r0Snx4qUo4x8jYIg2KZDsr9KSMfsKXFkzmlydD7NY1AlpBH2wiUoQdIOkVgFhM7z a8dhiEO+0BBv8Y6yRSnKUg3i3zhUOtQ+gzZNrNSTwI1F+bhL4zfAMtz1+dnk1sgDEhth uuDg== X-Forwarded-Encrypted: i=1; AHgh+RpvVWJPvwN03oSbhMEBq6f0YXp1BLb7Qg0JeEFtHpqR3cYCTPUYLZj9dDL27FDyTySL/DjY95Q=@vger.kernel.org X-Gm-Message-State: AOJu0YwTYRrTELuoQmtG+U1Xkb8oZyUJWdmoNYxRrFNctkj2Du3fhSe+ oBwO4H5LluEAEyjTYxy6LTdPQHXJXGzEukWW9eXApVJqJx+fhjkkCeIoV7t8nzBIir3CkHs5Rhn wylg5cRpggpXhdGkcFI1htKmcB2zOvJLMfyEysjfaYVMadFsXihw1q8czuQ== X-Gm-Gg: AR+sD1085EuJQMcqo3u3PhA+ytsnWT7HbJ9UVI0kaO6RbQ1Ba5/ywv5hbgKFTsJoe6n wvjtrmlLuxHr0/gOXML5VZGl1p3YtiB/x5Qgf1UuPDamGFCTlYCixAeMMpwCE5L/d1/HFnBgvYa gDD7Js4JAIYD5tHVnVN36B154s7GFHhBD/vBArnLa4IXPvN8dCBAqYHV55HgAOF5uv+H4ueBoQg XHZELnlapHN2D9/mgqIISe2STpFsQQQtZsImqDTfCv/2ESsA8toGXd/8XD/QwCTUc7rtJFF5glR cbmVLQ/kDX5V6tr+clC/gRN5g/Tq9Rmrd5yuQ48/uMGYuBLlu1uNcD9uXwLsEc30e5ziYOnGhw= = X-Received: by 2002:a05:600c:3b8e:b0:499:a0f3:9d5c with SMTP id 5b1f17b1804b1-499a0f3a47bmr140515245e9.3.1787071197512; Tue, 18 Aug 2026 09:39:57 -0700 (PDT) X-Received: by 2002:a05:600c:3b8e:b0:499:a0f3:9d5c with SMTP id 5b1f17b1804b1-499a0f3a47bmr140514605e9.3.1787071197097; Tue, 18 Aug 2026 09:39:57 -0700 (PDT) Received: from [192.168.2.83] ([46.175.183.46]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4999d0fb85csm191570345e9.11.2026.08.18.09.39.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Aug 2026 09:39:55 -0700 (PDT) Message-ID: <42813a1c-969e-4d7b-af4d-83fda6226e1e@redhat.com> Date: Tue, 18 Aug 2026 18:39:53 +0200 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: manual merge of the net-next tree with the net tree To: Mark Brown , David Miller , Jakub Kicinski , Paolo Abeni , Networking Cc: Ivan Vecera , Linux Kernel Mailing List , Linux Next Mailing List References: Content-Language: en-US From: Petr Oros In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/18/26 17:42, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/dpll/dpll_core.c > > between commit: > > 33f016b23a219 ("dpll: fix NULL deref in dpll_device_ops() during teardown race") > > from the net tree and commit: > > b1d0c412088e3 ("dpll: add STATE_CONNECTED_OVERRIDE pin capability") > > from the net-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. Your resolution is correct, thanks for handling it. Regards, Petr > diff --cc drivers/dpll/dpll_core.c > index a320eeb829ad2,245f625f4b3b4..0000000000000 > --- a/drivers/dpll/dpll_core.c > +++ b/drivers/dpll/dpll_core.c > @@@ -882,7 -881,14 +882,11 @@@ dpll_pin_register(struct dpll_device *d > if (WARN_ON(!ops) || > WARN_ON(!ops->state_on_dpll_get) || > WARN_ON(!ops->direction_get) || > - WARN_ON(ops->supported_ffo && !ops->ffo_get)) > - WARN_ON(ops->measured_freq_get && > - (!dpll_device_ops(dpll)->freq_monitor_get || > - !dpll_device_ops(dpll)->freq_monitor_set)) || > + WARN_ON(ops->supported_ffo && !ops->ffo_get) || > + WARN_ON((pin->prop.capabilities & > + DPLL_PIN_CAPABILITIES_STATE_CONNECTED_OVERRIDE) && > + !(pin->prop.capabilities & > + DPLL_PIN_CAPABILITIES_STATE_CAN_CHANGE))) > return -EINVAL; > > mutex_lock(&dpll_lock);