> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/freescale/enetc/enetc_pf.c
>
> between commit:
>
> e15c5506dd39 ("net: enetc: allocate vf_state during PF probes")
>
> from the net tree and commit:
>
> 3774409fd4c6 ("net: enetc: build enetc_pf_common.c as a separate
> module")
>
> 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.
>
Sorry for the merge conflict. I really appreciate your help in fixing it,
that's great.
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/net/ethernet/freescale/enetc/enetc_pf.c
> index c95a7c083b0f,a76ce41eb197..000000000000
> --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> @@@ -1277,12 -1024,7 +1015,13 @@@ static int enetc_pf_probe(struct
> pci_de
> pf = enetc_si_priv(si);
> pf->si = si;
> pf->total_vfs = pci_sriov_get_totalvfs(pdev);
> + if (pf->total_vfs) {
> + pf->vf_state = kcalloc(pf->total_vfs, sizeof(struct enetc_vf_state),
> + GFP_KERNEL);
> + if (!pf->vf_state)
> + goto err_alloc_vf_state;
> + }
> + pf->ops = &enetc_pf_ops;
>
> err = enetc_setup_mac_addresses(node, pf);
> if (err)
