Messages in this thread | | | Date | Thu, 10 Jun 2021 12:48:38 -0400 | From | Steven Rostedt <> | Subject | Re: [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
| |