Re: [PATCH net-next 2/3] dcbnl: adding DCBX feature flags get-set

[John Fastabend <john.r.fastabend@intel.com>]

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 <shmulikr@broadcom.com>
>>
>> Acked-by: John Fastabend <john.r.fastabend@intel.com>
>>
>> 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!