[GIT] net merged into net-next

2018-09-04 Thread David Miller
Just FYI...

Re: [GIT] 'net' merged into 'net-next'

2018-03-23 Thread Saeed Mahameed
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

Re: [GIT] 'net' merged into 'net-next'

2018-03-23 Thread Ido Schimmel
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

Re: [GIT] 'net' merged into 'net-next'

2018-03-23 Thread David Miller
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

Re: [GIT] 'net' merged into 'net-next'

2018-03-23 Thread Jason Gunthorpe
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

[GIT] 'net' merged into 'net-next'

2018-03-23 Thread David Miller
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.

[GIT] net merged into net-next

2018-03-05 Thread David Miller
If I botched up any part of the merge, please send me fix up patches. Thank you.