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 21B0747AF69 for ; Tue, 18 Aug 2026 16:40:02 +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=1787071204; cv=none; b=t244/BErDRqGpC3Q6X1faDJl5bD8hEJdWuP8m8qUbeXFxU7xxLyVORZuviLF5xSzH6Mry8OzNOyfqybeAI+uDd21sk2rFKyJA/YxlRu7uMqFekGsQsakpiC40FIafRvIGIo5ls0z2otBKfpFxC7utaP4HdDBzcwrB0tFozw6ev8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787071204; c=relaxed/simple; bh=LxXM6f8LvRMRdaBDCJgDddGoTAOWqIikLb7ZtyoSRlY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=mGT/UoOqZ4iSyceWhKQ1kB5RuP0CQHu8EmuTwL9jWk4VLbXcapyftd3GUAeHZBmF0jnBFeAr8D5m3Lj45EUMRV3m5lMcM0kJAu+IeUbmgj0yQmYEOwpYzcCNdBrVFuVVJESMa/2bt8kAtNqSggYuf6gRtPGtYSfdQNBp2oyaw+U= 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=MBpN9iDz; 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="MBpN9iDz"; 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=1787071202; 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=MBpN9iDzPkH4OmOPteOz/g7xMEqzMGlGY4JXMmBlK6n2P8DSnQaLCaIKHR2iT8vSnn2nLB KefiP1r+iZWYBUxoXSBXArRsqOIU/gd/KGcNpC3R5ZTx0yijRF7TzASD9L19kjADaW36l0 E9/GMYjPOjxihMcpWtkA9uFDCHGZ+R8= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-564-1yeZ-jvNMCyvimIPCfuaXQ-1; Tue, 18 Aug 2026 12:39:59 -0400 X-MC-Unique: 1yeZ-jvNMCyvimIPCfuaXQ-1 X-Mimecast-MFC-AGG-ID: 1yeZ-jvNMCyvimIPCfuaXQ_1787071198 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-49545071724so503915e9.0 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=bKf4O92b7LGHVokACSEysaJpCa2QG6bFSiVD/BiO54fQo3ji6w5MJItU6uc87hBJWd +zJooNQ1Eb8Nj419OPMGak8zfmekcePRwwOZu2yTyh1iIOYGe5s8j5b/Uxz/3YgDAnuz Dt/MUyPu2u1x1r4Vkd2G8un4EAXWduCmnm5v929KLypgAz13swYaRl1dEiIPFopFaD3F OMtBFJhj0UIkT5SLN5TvI9yeWJp51W1FUALWMKV3xwVOV9WTkJmcT5H6NaGFLnzZ+V8H KwXMZfTPTNuIgX7YBV7v2JmqOaJf7JOJtFB+O/K3Risxudl1avqXBsYqzzPGNPmxlOv8 JcSg== X-Forwarded-Encrypted: i=1; AHgh+RreexT0VE5o6zj9Uxt+igA6AEr2hw3l8ESgqfZ29QV4J/Fc2E7Pq/OEzQPcdX2HporNeC5V5v1LrrOT5Xw=@vger.kernel.org X-Gm-Message-State: AOJu0YwD24Q2VE/hBqu6EZWQ9zi8aOSfJzuBd13sh4ZTZlKgD/7vC9hX U6l+8pFjMZYdP75hZFdvF9wEBV1DcyGLwwTCYHXwJLbqzo+sBWcHx3yaHIr2l+ZoJX2z2Xik9Lb KkTNyt08nlKctaFvFRKydbtbwR5/sRnXh/1znQjOHaJTFg+mQRPiEV6LFjcgFSEEerA== X-Gm-Gg: AR+sD12fXzNUnA7++/1oiyPAcsgO2n2WkC43zN6og1siNSoHhXuo5F3wwZoEFSHTZxq kD+EcXrz9wBybOxlmbIXvIX9/sJbqQ/djuGO1EJ+ZiTAmn0qjb3Q59Sv8gjQHWUPxSQ5XoSmu3z qwglu7sM1CiiEdcO8E0qpbJs+AEdW7bXmEuR0M8K0c5yV3GNaED99vjfcq5K1RLv6nZXb3HQXIk bD0d32oc7W8WW3tVHIaoVja6/itzRzbrBQhpt44n8lVUKQCHkLGl/v5Sfqk99w+tD4tUHySRbYj q2IrdshMURnBRuUnL8Hf2+4uK8J/aRkD0ROoylXXFP9B8bJVW2/uvQts27wbc+q8Y2vVeYrpSQ= = X-Received: by 2002:a05:600c:3b8e:b0:499:a0f3:9d5c with SMTP id 5b1f17b1804b1-499a0f3a47bmr140515345e9.3.1787071197526; 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: linux-kernel@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);