| Message ID | 20201130130223.7788ec13@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the net tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc drivers/net/ethernet/ibm/ibmvnic.c index bca1becd33f0,cdd1ff9aa9c4..000000000000 --- a/drivers/net/ethernet/ibm/ibmvnic.c
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/ibm/ibmvnic.c between commit: 9281cf2d5840 ("ibmvnic: avoid memset null scrq msgs") from the net tree and commit: f019fb6392e5 ("ibmvnic: Introduce indirect subordinate Command Response Queue buffer") 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.