From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Fastabend Subject: Re: [PATCH net-next 2/3] dcbnl: adding DCBX feature flags get-set Date: Wed, 29 Dec 2010 09:21:05 -0800 Message-ID: <4D1B6E01.8080301@intel.com> References: <1292959973.7142.131.camel@lb-tlvb-shmulik.il.broadcom.com> <4D1A7D85.2030709@intel.com> <1293631553.29378.30.camel@lb-tlvb-shmulik.il.broadcom.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: "davem@davemloft.net" , Eilon Greenstein , "Liu, Lucy" , "netdev@vger.kernel.org" To: Shmulik Ravid Return-path: Received: from mga02.intel.com ([134.134.136.20]:6154 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753606Ab0L2RVH (ORCPT ); Wed, 29 Dec 2010 12:21:07 -0500 In-Reply-To: <1293631553.29378.30.camel@lb-tlvb-shmulik.il.broadcom.com> Sender: netdev-owner@vger.kernel.org List-ID: On 12/29/2010 6:05 AM, Shmulik Ravid wrote: > > On Tue, 2010-12-28 at 16:15 -0800, John Fastabend wrote: >> On 12/21/2010 11:32 AM, Shmulik Ravid wrote: >>> Adding a pair of set-get functions to dcbnl for setting the negotiation >>> flags of the various DCB features. The user sets these flags (enable, >>> advertise, willing) for each feature to be used by the device DCBX >>> engine. The 'get' routine returns which of the features is enabled >>> after the negotiation. >>> >>> Signed-off-by: Shmulik Ravid >> >> Acked-by: John Fastabend >> >> Dave, these are going to conflict with my patches >> >> [net-next-2.6,1/3] dcbnl: add support for ieee8021Qaz attributes >> [net-next-2.6,2/3] dcbnl: add appliction tlv handlers >> >> If needed either Shmulik or myself can work out the conflicts if you want a single series that applies cleanly. >> >> Thanks, >> John. > > John, > > Since I need to modify my patches I can resubmit them on top of your > patches above so that they would need to be applied after yours are. Is > this a good way to resolve the conflicts ? > > Thanks, > Shmulik > > Great this would be helpful. Just be sure to note the dependency when you submit the patches. Thanks a lot!