Message ID | 20200508131851.5818d84d@canb.auug.org.au |
---|---|
State | Not Applicable |
Delegated to: | David Miller |
Headers | show |
Series | linux-next: manual merge of the net-next tree with the rdma tree | expand |
On Fri, May 08, 2020 at 01:18:51PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/bonding/bond_main.c > > between commits: > > ed7d4f023b1a ("bonding: Rename slave_arr to usable_slaves") > c071d91d2a89 ("bonding: Add helper function to get the xmit slave based on hash") > 29d5bbccb3a1 ("bonding: Add helper function to get the xmit slave in rr mode") > > from the rdma and mlx5-next trees and commit: > > ae46f184bc1f ("bonding: propagate transmit status") > > from the net-next tree. Saeed? These patches in the shared branch were supposed to be a PR to net-net? I see it hasn't happened yet and now we have conflicts?? Jason
On Fri, 2020-05-08 at 13:18 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/bonding/bond_main.c > > between commits: > > ed7d4f023b1a ("bonding: Rename slave_arr to usable_slaves") > c071d91d2a89 ("bonding: Add helper function to get the xmit slave > based on hash") > 29d5bbccb3a1 ("bonding: Add helper function to get the xmit slave > in rr mode") > > from the rdma and mlx5-next trees and commit: > > ae46f184bc1f ("bonding: propagate transmit status") > > from the net-next tree. > > I fixed it up (I think - 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. > Hi Stephen and thanks for the report. Your fix seems to be ok, i think it is missing some hunks for bond_get_slave_by_id function and some "likely" directives are missing, which were added by Maor's or Eric's patches. Anyway this is already fixed up in my net-next-mlx5 tree and will be submitted very soon to net-next with the conflict fixup .. Thanks, Saeed.
On Fri, 2020-05-08 at 09:35 -0300, Jason Gunthorpe wrote: > On Fri, May 08, 2020 at 01:18:51PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the net-next tree got a conflict in: > > > > drivers/net/bonding/bond_main.c > > > > between commits: > > > > ed7d4f023b1a ("bonding: Rename slave_arr to usable_slaves") > > c071d91d2a89 ("bonding: Add helper function to get the xmit slave > > based on hash") > > 29d5bbccb3a1 ("bonding: Add helper function to get the xmit slave > > in rr mode") > > > > from the rdma and mlx5-next trees and commit: > > > > ae46f184bc1f ("bonding: propagate transmit status") > > > > from the net-next tree. > > Saeed? These patches in the shared branch were supposed to be a PR to > net-net? I see it hasn't happened yet and now we have conflicts?? > Yes, I don't usually send standalone PRs of mlx5-next, and I only do it with the corresponding (depending on) patches from net-next-mlx5, but I agree this one was different I should have submitted it .. anyway the conflict is minor, i already fixed it up and will submit soon.. Thanks, Saeed.
diff --cc drivers/net/bonding/bond_main.c index 39b1ad7edbb4,4f9e7c421f57..000000000000 --- a/drivers/net/bonding/bond_main.c