On Fri, 2019-04-26 at 16:11 -0400, David Miller wrote: > From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > Date: Fri, 26 Apr 2019 13:11:38 +0200 > > > And another set for -next, not that big this time. > > See below for a summary of the highlights. > > > > Please pull and let me know if there's any problem. > > Pulled, thanks Johannes. > > There was a minor confict in the TX code, two variables being added > from different commits. Oops, yeah, I knew about this but forgot to mention it, sorry about that. > Please double check my conflict resolution. Looks fine, the order of the variables doesn't really matter and we do need them both now :-) johannes
