weird, git am still give me same error, but removing headers and applying diff using git apply works, anyways thanks. LGTM.
Regards, Pritesh On Jun 30, 2014, at 1:56 PM, Jesse Gross <je...@nicira.com> wrote: > Yes, it worked fine for me (using git am). > > On Mon, Jun 30, 2014 at 1:52 PM, Ben Pfaff <b...@nicira.com> wrote: >> That's odd. Jesse, did this apply for you? >> >> On Mon, Jun 30, 2014 at 08:47:08PM +0000, Pritesh Kothari (pritkoth) wrote: >>> LGTM but give error on master: >>> error: patch failed: datapath/flow_netlink.c:524 >>> error: datapath/flow_netlink.c: patch does not apply >>> >>> Regards, >>> Pritesh >>> >>> On Jun 30, 2014, at 1:37 PM, Ben Pfaff <b...@nicira.com> wrote: >>> >>>> Found by inspection. >>>> >>>> Signed-off-by: Ben Pfaff <b...@nicira.com> >>>> --- >>>> datapath/flow_netlink.c | 5 +++-- >>>> 1 file changed, 3 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c >>>> index 5a1a487..5ee3150 100644 >>>> --- a/datapath/flow_netlink.c >>>> +++ b/datapath/flow_netlink.c >>>> @@ -1,5 +1,5 @@ >>>> /* >>>> - * Copyright (c) 2007-2013 Nicira, Inc. >>>> + * Copyright (c) 2007-2014 Nicira, Inc. >>>> * >>>> * This program is free software; you can redistribute it and/or >>>> * modify it under the terms of version 2 of the GNU General Public >>>> @@ -524,7 +524,8 @@ static int ipv4_tun_to_nlattr(struct sk_buff *skb, >>>> return -EMSGSIZE; >>>> if (tun_opts && >>>> nla_put(skb, OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS, >>>> - swkey_tun_opts_len, tun_opts)); >>>> + swkey_tun_opts_len, tun_opts)) >>>> + return -EMSGSIZE; >>>> >>>> nla_nest_end(skb, nla); >>>> return 0; >>>> -- >>>> 1.7.10.4 >>>> >>>> _______________________________________________ >>>> dev mailing list >>>> dev@openvswitch.org >>>> http://openvswitch.org/mailman/listinfo/dev >>> > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
