From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754004AbeAOHxS (ORCPT + 1 other); Mon, 15 Jan 2018 02:53:18 -0500 Received: from mail-vk0-f42.google.com ([209.85.213.42]:46558 "EHLO mail-vk0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751732AbeAOHxQ (ORCPT ); Mon, 15 Jan 2018 02:53:16 -0500 X-Google-Smtp-Source: ACJfBosS6uVOHD0+kmw1qk+gP3+0oKncj7/aaz/EnoOLknXgIEpZe6gjtF5fb9ozxj+qySxxxay5Zn2Q2Hq3hON94hM= MIME-Version: 1.0 In-Reply-To: <20180115105221.5f159c19@canb.auug.org.au> References: <20180115105221.5f159c19@canb.auug.org.au> From: Eran Ben Elisha Date: Mon, 15 Jan 2018 09:53:14 +0200 Message-ID: Subject: Re: linux-next: manual merge of the net-next tree with the net tree To: Stephen Rothwell Cc: David Miller , Networking , Linux-Next Mailing List , Linux Kernel Mailing List , Eran Ben Elisha , Saeed Mahameed , Or Gerlitz Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On Mon, Jan 15, 2018 at 1:52 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > include/linux/mlx5/mlx5_ifc.h > > between commit: > > 8978cc921fc7 ("{net,ib}/mlx5: Don't disable local loopback multicast traffic when needed") > > from the net tree and commit: > > 40817cdbb695 ("net/mlx5: Add hairpin definitions to the FW API") > > 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. sure, https://patchwork.ozlabs.org/patch/859425/ > > -- > Cheers, > Stephen Rothwell > > diff --cc include/linux/mlx5/mlx5_ifc.h > index 1391a82da98e,78e36fc2609e..000000000000 > --- a/include/linux/mlx5/mlx5_ifc.h > +++ b/include/linux/mlx5/mlx5_ifc.h > @@@ -1027,9 -1035,10 +1035,10 @@@ struct mlx5_ifc_cmd_hca_cap_bits > u8 log_max_wq_sz[0x5]; > > u8 nic_vport_change_event[0x1]; > - u8 disable_local_lb[0x1]; > - u8 reserved_at_3e2[0x1]; > + u8 disable_local_lb_uc[0x1]; > + u8 disable_local_lb_mc[0x1]; > - u8 reserved_at_3e3[0x8]; > + u8 log_min_hairpin_wq_data_sz[0x5]; > + u8 reserved_at_3e8[0x3]; Conflict fix looks good as proposed. thanks for the fix, Eran. > u8 log_max_vlan_list[0x5]; > u8 reserved_at_3f0[0x3]; > u8 log_max_current_mc_list[0x5];