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

[Florian Fainelli]

2015-05-20 19:59 GMT-07:00 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/phy/phy.c between commit c15e10e71ce3 ("net: phy: Make sure
> phy_start() always re-enables the phy interrupts") from the net tree
> and commit 3e2186e02112 ("net: phy: Add state machine state transitions
> debug prints") from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks correct to me, thanks Stephen!

>
> --
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
>
> diff --cc drivers/net/phy/phy.c
> index 47cd578052fc,1457ecf75dcc..000000000000
> --- a/drivers/net/phy/phy.c
> +++ b/drivers/net/phy/phy.c
> @@@ -783,7 -794,8 +808,8 @@@ void phy_state_machine(struct work_stru
>         struct delayed_work *dwork = to_delayed_work(work);
>         struct phy_device *phydev =
>                         container_of(dwork, struct phy_device, state_queue);
>  -      bool needs_aneg = false, do_suspend = false, do_resume = false;
>  +      bool needs_aneg = false, do_suspend = false;
> +       enum phy_state old_state;
>         int err = 0;
>
>         mutex_lock(&phydev->lock);



-- 
Florian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/