There were a bunch of conflicts, but the issue seemed to be more about
quantity than difficulty in resolution.
Saeed, thanks for the conflict resolution guidance it helped a lot. I
always like to do the resolutions by hand so I can double check things,
rather than pull a resolution from a GIT t
Just FYI...
Please double check my work, although the conflict resolutions were
relatively trivial this time.
Especially interested for some of us is that now both networking
tree have the fixes to objtool for gcc-8 which was causing tons
of bogus warnings to be emitted. Recent upgrades to Fedora 28
would h
On Fri, 2018-03-23 at 13:36 -0400, David Miller wrote:
> From: Jason Gunthorpe
> Date: Fri, 23 Mar 2018 11:26:22 -0600
>
> > On Fri, Mar 23, 2018 at 11:40:59AM -0400, David Miller wrote:
> > >
> > > This merge was a little bit more hectic than usual.
> > >
> > > But thankfully, I had some sampl
On Fri, Mar 23, 2018 at 11:40:59AM -0400, David Miller wrote:
>
> This merge was a little bit more hectic than usual.
>
> But thankfully, I had some sample conflict resolutions to work
> with, in particular for the mlx5 infiniband changes which were
> the most difficult to resolve.
>
> Please do
From: Jason Gunthorpe
Date: Fri, 23 Mar 2018 11:26:22 -0600
> On Fri, Mar 23, 2018 at 11:40:59AM -0400, David Miller wrote:
>>
>> This merge was a little bit more hectic than usual.
>>
>> But thankfully, I had some sample conflict resolutions to work
>> with, in particular for the mlx5 infiniba
On Fri, Mar 23, 2018 at 11:40:59AM -0400, David Miller wrote:
>
> This merge was a little bit more hectic than usual.
>
> But thankfully, I had some sample conflict resolutions to work
> with, in particular for the mlx5 infiniband changes which were
> the most difficult to resolve.
>
> Please do
This merge was a little bit more hectic than usual.
But thankfully, I had some sample conflict resolutions to work
with, in particular for the mlx5 infiniband changes which were
the most difficult to resolve.
Please double check my work and provide any fixup patches if
necessary.
Thank you.
If I botched up any part of the merge, please send me fix up
patches.
Thank you.
On 2018年01月21日 04:17, Cong Wang wrote:
On Fri, Jan 19, 2018 at 8:02 PM, David Miller wrote:
Cong, please check my conflict resolution of drivers/net/tun.c, thank
you.
It looks good to me except I am not sure about the xdp_rxq_info_unreg()
inside tun_cleanup_tx_ring().
Looks correct to me.
On Fri, Jan 19, 2018 at 8:02 PM, David Miller wrote:
>
> Cong, please check my conflict resolution of drivers/net/tun.c, thank
> you.
It looks good to me except I am not sure about the xdp_rxq_info_unreg()
inside tun_cleanup_tx_ring().
Cong, please check my conflict resolution of drivers/net/tun.c, thank
you.
On 01/17/2018 06:19 AM, David Miller wrote:
>
> Daniel, please double check my merge work especially wrt. your
> packet scheduler fix.
The merge resolution for the qdisc bits looks good to me, thanks!
Dave,
The resolution of the mlx5_ifc conflict was wrong and it causes a build break
in mlx5, oops :(.
I hope my resolution instructions in my pull request didn't mislead you.
I will post a patch.
-Saeed.
Daniel, please double check my merge work especially wrt. your
packet scheduler fix.
Thanks!
Thanks David,
There was one other change that conflicts (functionally) with this
merge as well: 3b24d854cb35 ("tcp/dccp: do not touch listener
sk_refcnt under synflood")
It did a similar hlist_nulls -> hlist transform for the TCP stack.
I'll send a formal patch to address this as well.
Craig
On S
On Sat, 2016-04-23 at 20:12 -0400, David Miller wrote:
> Eric, please double check my merge work for net/ipv4/udp.c
>
> In net we fixed a soreuseport bug that added a hlist_nulls_add_tail_rcu()
> call to net/ipv4/udp.c
>
> And in net-next you converted UDP sockets away from nulls lists.
>
> Ther
Eric, please double check my merge work for net/ipv4/udp.c
In net we fixed a soreuseport bug that added a hlist_nulls_add_tail_rcu()
call to net/ipv4/udp.c
And in net-next you converted UDP sockets away from nulls lists.
Therefore I had to add a hlist_add_tail_rcu() implementation to
linux/rcul
18 matches
Mail list logo
