From: Florian Westphal
Date: Sat, 18 May 2019 23:33:35 +0200
> In nf-next, I had extended this script to also cover NAT support for the
> inet family.
>
> In nf, I extended it to cover a regression with 'fully-random' masquerade.
>
> Make this script work again by resolving the conflicts as nee
In nf-next, I had extended this script to also cover NAT support for the
inet family.
In nf, I extended it to cover a regression with 'fully-random' masquerade.
Make this script work again by resolving the conflicts as needed.
Fixes: 8b4483658364f0 ("Merge
git://git.kernel.org/pub/scm/linux/ker
Thu, Nov 02, 2017 at 07:08:12PM CET, xiyou.wangc...@gmail.com wrote:
>On Wed, Nov 1, 2017 at 11:51 PM, David Miller wrote:
>>
>> Cong, I just did another net --> net-next merge.
>>
>> Please look at how I resolved the cls_api.c conflict.
>>
>> Thank you
On Wed, Nov 1, 2017 at 11:51 PM, David Miller wrote:
>
> Cong, I just did another net --> net-next merge.
>
> Please look at how I resolved the cls_api.c conflict.
>
> Thank you.
Looks good to me.
Thanks for solving the pain! ;)
Cong, I just did another net --> net-next merge.
Please look at how I resolved the cls_api.c conflict.
Thank you.
> From: gre...@linuxfoundation.org [mailto:gre...@linuxfoundation.org]
> Sent: Wednesday, March 16, 2016 10:41
> To: Dexuan Cui
> Cc: David Miller ; netdev@vger.kernel.org; KY
> Srinivasan ; Haiyang Zhang
> Subject: Re: When will net-next merge with linux-next?
>
> On We
g Zhang
> > Subject: Re: When will net-next merge with linux-next?
> >
> > On Tue, Mar 15, 2016 at 11:11:34AM +, Dexuan Cui wrote:
> > > I'm wondering whether (and when) step 2 will happen in the next 2 weeks,
> > > that is, before the tag 4.6-rc1 is mad
> From: gre...@linuxfoundation.org [mailto:gre...@linuxfoundation.org]
> Sent: Tuesday, March 15, 2016 23:06
> To: Dexuan Cui
> Cc: David Miller ; netdev@vger.kernel.org; KY
> Srinivasan ; Haiyang Zhang
> Subject: Re: When will net-next merge with linux-next?
>
> On Tu
On Tue, Mar 15, 2016 at 11:11:34AM +, Dexuan Cui wrote:
> I'm wondering whether (and when) step 2 will happen in the next 2 weeks,
> that is, before the tag 4.6-rc1 is made.
> If not, I guess I'll miss 4.6?
You missed 4.6 as your patch was not in any of our trees a few days
before 4.5 was rele
> From: gre...@linuxfoundation.org [mailto:gre...@linuxfoundation.org]
> Sent: Tuesday, March 15, 2016 0:22
> To: Dexuan Cui
> Cc: David Miller ; netdev@vger.kernel.org; KY
> Srinivasan ; Haiyang Zhang
> Subject: Re: When will net-next merge with linux-next?
>
> On Mo
On Mon, Mar 14, 2016 at 06:09:41AM +, Dexuan Cui wrote:
> Hi David,
> I have a pending patch of the hv_sock driver, which should go into the
> kernel through the net-next tree:
> https://lkml.org/lkml/2016/2/14/7
>
> The VMBus side's supporting patches of hv_sock have been in Greg's tree
> and
Hi David,
I have a pending patch of the hv_sock driver, which should go into the
kernel through the net-next tree:
https://lkml.org/lkml/2016/2/14/7
The VMBus side's supporting patches of hv_sock have been in Greg's tree
and linux-next for more than 1 month, but they haven't been in net-next
yet,
Hi Dave,
in your merge commit b633353115e3 ("Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net"), you merged
net into net-next and commit 930b37ee8d84 ("net: phy: Add SGMII support
for Marvell 88E1510/1512/1514/1518") overwrote a fix from
commit 79be1a1c9090 ("phy: marvell: Fix and uni
On Sat, Oct 24, 2015 at 6:55 AM, David Miller wrote:
>
> I needed to do a merge of 'net' into 'net-next' in order to
> facilitate a set of tipc patches that I wanted to apply to
> 'net-next'.
>
> There were several openvswitch merge conflicts, mostly to do with the
> egress tunnel info bug fix con
I needed to do a merge of 'net' into 'net-next' in order to
facilitate a set of tipc patches that I wanted to apply to
'net-next'.
There were several openvswitch merge conflicts, mostly to do with the
egress tunnel info bug fix conflicting with the simplification of the
vport ->send() method.
I
15 matches
Mail list logo
