Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c
between commit:
bd6781c18cb5 ("bnxt_en: Fix wrong return value check in bnxt_close_nic()")
from the net tree and commit:
84793a499578 ("bnxt_en: Skip nic close/open when configuring tstamp filters")
from the net-next tree.
I fixed it up (I just used the latter) 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.
--
Cheers,
Stephen Rothwell
Attachment:
pgpQyOcKfPRJw.pgp
Description: OpenPGP digital signature
