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

[Mark Brown]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/ethernet/hisilicon/hisi_femac.c

between commit:

  4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")

from the origin tree and commit:

  10830cb24e915 ("net: hisilicon: Remove orphan femac driver")

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.

Deleted the file.  Kees, *please* don't do these changes at -rc2,
there's a reason they're normally done at -rc1.

Attachment: signature.asc
Description: PGP signature