From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45027C47094 for ; Thu, 10 Jun 2021 16:48:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D983613E7 for ; Thu, 10 Jun 2021 16:48:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231338AbhFJQuh (ORCPT ); Thu, 10 Jun 2021 12:50:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:54674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231179AbhFJQug (ORCPT ); Thu, 10 Jun 2021 12:50:36 -0400 Received: from oasis.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8EFEF6108E; Thu, 10 Jun 2021 16:48:39 +0000 (UTC) Date: Thu, 10 Jun 2021 12:48:38 -0400 From: Steven Rostedt To: Masami Hiramatsu Cc: Devin Moore , LKML , Ingo Molnar Subject: Re: [PATCH v4 0/6] bootconfig: Add mixed subkeys and value under the same key Message-ID: <20210610124838.461870d5@oasis.local.home> In-Reply-To: <20210610123852.606aa3a4@oasis.local.home> References: <162262192121.264090.6540508908529705156.stgit@devnote2> <20210610234809.9d1e92cb3f04842e14c3d011@kernel.org> <20210610122607.3817da31@oasis.local.home> <20210610123852.606aa3a4@oasis.local.home> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 10 Jun 2021 12:38:52 -0400 Steven Rostedt 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