Re: linux-next: manual merge of the net-next tree with the net tree

[Petr Oros]

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);