Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/netfilter/ipvs/ip_vs_conn.c
between commit:
16e98cec49a4 ("ipvs: don't show negative times in ip_vs_conn")
from the netfilter tree and commit:
ec1b28ca9674 ("ipvs: provide just conn to ip_vs_state_name")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc net/netfilter/ipvs/ip_vs_conn.c
index 615286dcf4c0,0edc62910ebf..000000000000
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@@ -1107,10 -1122,8 +1122,10 @@@ static int ip_vs_conn_seq_show(struct s
&cp->caddr.in6, ntohs(cp->cport),
&cp->vaddr.in6, ntohs(cp->vport),
dbuf, ntohs(cp->dport),
- ip_vs_state_name(cp->protocol, cp->state),
+ ip_vs_state_name(cp),
- (cp->timer.expires-jiffies)/HZ, pe_data);
+ jiffies_delta_to_msecs(cp->timer.expires -
+ jiffies) / 1000,
+ pe_data);
else
#endif
seq_printf(seq,
@@@ -1120,10 -1133,8 +1135,10 @@@
ntohl(cp->caddr.ip), ntohs(cp->cport),
ntohl(cp->vaddr.ip), ntohs(cp->vport),
dbuf, ntohs(cp->dport),
- ip_vs_state_name(cp->protocol, cp->state),
+ ip_vs_state_name(cp),
- (cp->timer.expires-jiffies)/HZ, pe_data);
+ jiffies_delta_to_msecs(cp->timer.expires -
+ jiffies) / 1000,
+ pe_data);
}
return 0;
}
@@@ -1173,10 -1184,9 +1188,10 @@@ static int ip_vs_conn_sync_seq_show(str
&cp->caddr.in6, ntohs(cp->cport),
&cp->vaddr.in6, ntohs(cp->vport),
dbuf, ntohs(cp->dport),
- ip_vs_state_name(cp->protocol, cp->state),
+ ip_vs_state_name(cp),
ip_vs_origin_name(cp->flags),
- (cp->timer.expires-jiffies)/HZ);
+ jiffies_delta_to_msecs(cp->timer.expires -
+ jiffies) / 1000);
else
#endif
seq_printf(seq,
@@@ -1186,10 -1196,9 +1201,10 @@@
ntohl(cp->caddr.ip), ntohs(cp->cport),
ntohl(cp->vaddr.ip), ntohs(cp->vport),
dbuf, ntohs(cp->dport),
- ip_vs_state_name(cp->protocol, cp->state),
+ ip_vs_state_name(cp),
ip_vs_origin_name(cp->flags),
- (cp->timer.expires-jiffies)/HZ);
+ jiffies_delta_to_msecs(cp->timer.expires -
+ jiffies) / 1000);
}
return 0;
}
Hi all,
On Tue, 7 Aug 2018 12:49:32 +1000 Stephen Rothwell <[email protected]> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/netfilter/ipvs/ip_vs_conn.c
>
> between commit:
>
> 16e98cec49a4 ("ipvs: don't show negative times in ip_vs_conn")
>
> from the netfilter tree and commit:
>
> ec1b28ca9674 ("ipvs: provide just conn to ip_vs_state_name")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc net/netfilter/ipvs/ip_vs_conn.c
> index 615286dcf4c0,0edc62910ebf..000000000000
> --- a/net/netfilter/ipvs/ip_vs_conn.c
> +++ b/net/netfilter/ipvs/ip_vs_conn.c
> @@@ -1107,10 -1122,8 +1122,10 @@@ static int ip_vs_conn_seq_show(struct s
> &cp->caddr.in6, ntohs(cp->cport),
> &cp->vaddr.in6, ntohs(cp->vport),
> dbuf, ntohs(cp->dport),
> - ip_vs_state_name(cp->protocol, cp->state),
> + ip_vs_state_name(cp),
> - (cp->timer.expires-jiffies)/HZ, pe_data);
> + jiffies_delta_to_msecs(cp->timer.expires -
> + jiffies) / 1000,
> + pe_data);
> else
> #endif
> seq_printf(seq,
> @@@ -1120,10 -1133,8 +1135,10 @@@
> ntohl(cp->caddr.ip), ntohs(cp->cport),
> ntohl(cp->vaddr.ip), ntohs(cp->vport),
> dbuf, ntohs(cp->dport),
> - ip_vs_state_name(cp->protocol, cp->state),
> + ip_vs_state_name(cp),
> - (cp->timer.expires-jiffies)/HZ, pe_data);
> + jiffies_delta_to_msecs(cp->timer.expires -
> + jiffies) / 1000,
> + pe_data);
> }
> return 0;
> }
> @@@ -1173,10 -1184,9 +1188,10 @@@ static int ip_vs_conn_sync_seq_show(str
> &cp->caddr.in6, ntohs(cp->cport),
> &cp->vaddr.in6, ntohs(cp->vport),
> dbuf, ntohs(cp->dport),
> - ip_vs_state_name(cp->protocol, cp->state),
> + ip_vs_state_name(cp),
> ip_vs_origin_name(cp->flags),
> - (cp->timer.expires-jiffies)/HZ);
> + jiffies_delta_to_msecs(cp->timer.expires -
> + jiffies) / 1000);
> else
> #endif
> seq_printf(seq,
> @@@ -1186,10 -1196,9 +1201,10 @@@
> ntohl(cp->caddr.ip), ntohs(cp->cport),
> ntohl(cp->vaddr.ip), ntohs(cp->vport),
> dbuf, ntohs(cp->dport),
> - ip_vs_state_name(cp->protocol, cp->state),
> + ip_vs_state_name(cp),
> ip_vs_origin_name(cp->flags),
> - (cp->timer.expires-jiffies)/HZ);
> + jiffies_delta_to_msecs(cp->timer.expires -
> + jiffies) / 1000);
> }
> return 0;
> }
This is now a conflict between Linus' tree and the netfilter tree.
--
Cheers,
Stephen Rothwell
On Thu, Aug 16, 2018 at 09:47:23AM +1000, Stephen Rothwell wrote:
> On Tue, 7 Aug 2018 12:49:32 +1000 Stephen Rothwell <[email protected]> wrote:
[...]
> This is now a conflict between Linus' tree and the netfilter tree.
Will rebase nf.git here, so next pull request already deals with this
here to make it easier for upstream maintainers.
@Matteo, let me know if this is a problem in your case, you may have
references to the original commits in your backport queue probably.
Thanks for the heads up and sorry for the inconvenience.