You need to repost the patches in a way that "git am" can apply then one after another. "git send-email" is the easiest way.
On Mon, Oct 27, 2014 at 05:25:37PM +0530, Rishi Bamba wrote: > Hi Ben, > > Thanks for the review. As far as I can understand the commit message has only > one line difference and that might look that the two commits are same but > they are not. Patch 1 is related to setting of importance parameter in a rule > and Patch 2 is related to addition of the test cases for the same.Hope this > clarifies. > > > Rishi > > Thank You > Regards > Rishi Bamba > > > ----- Original Message ----- > From: "Ben Pfaff" <b...@nicira.com> > To: "Rishi Bamba" <rishi.ba...@tcs.com> > Cc: dev@openvswitch.org, "partha datta" <partha.da...@tcs.com>, "deepankar > gupta" <deepankar.gu...@tcs.com> > Sent: Saturday, October 11, 2014 2:04:18 AM > Subject: Re: [PATCH 2/4] ovs-ofctl:To set importance of a rule for > eviction(OF14) > > On Fri, Oct 10, 2014 at 07:20:14PM +0530, Rishi Bamba wrote: > > Hi Ben, > > > > # In reference to the [Patch 1/4] This patch includes the Design file > > changes as suggested and test cases for add-flow and dump-flow > > # CLI in order to perform testing of the importance parameter in a rule for > > different protocols of OpenFlow. > > > > --- > > This patch enables a user to set importance for a new rule via add-flow > > OF1.1+ in the OVS and display the same via dump-flows command OF1.1+ . > > The changes are made in accordance with OpenFlow 1.4 specs to implement > > Eviction on the basis of "importance". > > > > #Changes made to DESIGN and added test cases > > > > Signed-off-by: Rishi Bamba <rishi.ba...@tcs.com> > > Patches 1/2 and 2/2 conflict with each other. > > I see the same formatting problems as with patch 1. Please use "git > send-email". It will get the formatting correct. > =====-----=====-----===== > Notice: The information contained in this e-mail > message and/or attachments to it may contain > confidential or privileged information. If you are > not the intended recipient, any dissemination, use, > review, distribution, printing or copying of the > information contained in this e-mail message > and/or attachments to it are strictly prohibited. If > you have received this communication in error, > please notify us by reply e-mail or telephone and > immediately and permanently delete the message > and any attachments. Thank you > > _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
