lkml.org 
[lkml]   [2021]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v4 0/6] bootconfig: Add mixed subkeys and value under the same key
On Thu, 10 Jun 2021 12:38:52 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:

> In the mean time, I'll just push out the branch to linux-next.

So much for keeping this separate. I just tried to merge it and it
gives me conflicts with the update I pulled in my other branch.

I guess it's fine to just add these on top of my other changes.

-- Steve

\
 
 \ /
  Last update: 2021-06-10 18:49    [W:0.076 / U:0.884 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site