On Wed, 3 May 2017 18:59:05 -0700
Linus Torvalds wrote:
> On Tue, May 2, 2017 at 4:41 PM, Steven Rostedt wrote:
> >
> > This will conflict with changes I have already sent to you. They may
> > not be so trivial to fix. I merged my urgent branch when pushing to
> > linux-next. You can look at
On Tue, May 2, 2017 at 4:41 PM, Steven Rostedt wrote:
>
> This will conflict with changes I have already sent to you. They may
> not be so trivial to fix. I merged my urgent branch when pushing to
> linux-next. You can look at how I resolved the conflicts in my
> "for-next" branch, specificall
2 matches
Mail list logo
