lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <1293631553.29378.30.camel@lb-tlvb-shmulik.il.broadcom.com> Date: Wed, 29 Dec 2010 16:05:53 +0200 From: "Shmulik Ravid" <shmulikr@...adcom.com> To: "John Fastabend" <john.r.fastabend@...el.com> cc: "davem@...emloft.net" <davem@...emloft.net>, "Eilon Greenstein" <eilong@...adcom.com>, "Liu, Lucy" <lucy.liu@...el.com>, "netdev@...r.kernel.org" <netdev@...r.kernel.org> Subject: Re: [PATCH net-next 2/3] dcbnl: adding DCBX feature flags get-set 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@...adcom.com> > > Acked-by: John Fastabend <john.r.fastabend@...el.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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists