From: "Shevchenko, Andriy" <andriy.shevchenko@intel.com>
To: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>,
ACPI Devel Maling List <linux-acpi@vger.kernel.org>
Subject: Re: [PATCH 02/11] ACPI: acpica: Constify pathname argument for acpi_get_handle()
Date: Fri, 20 May 2022 17:21:58 +0300 [thread overview]
Message-ID: <YoekBq6zKocR/mGy@smile.fi.intel.com> (raw)
In-Reply-To: <YocxciJSTkc5leZa@paasikivi.fi.intel.com>
On Fri, May 20, 2022 at 09:13:06AM +0300, Sakari Ailus wrote:
> On Thu, May 19, 2022 at 08:05:00PM +0200, Rafael J. Wysocki wrote:
...
> Funnily enough, I saw no
> conflicts with your linux-next branch. git am is more picky than git rebase
> though.
My experience with both is telling me that it might be related to the context,
rebase is really trying hard to resolve possible conflicts / context issues
automatically. That said, I believe `git am -C1 ...` should solve that.
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2022-05-20 14:22 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-06 13:00 [PATCH 00/11] ACPI: Buffer property and reference as string support Sakari Ailus
2022-05-06 13:00 ` [PATCH 01/11] ACPI: property: Return type of acpi_add_nondev_subnodes() should be bool Sakari Ailus
2022-05-06 13:00 ` [PATCH 02/11] ACPI: acpica: Constify pathname argument for acpi_get_handle() Sakari Ailus
2022-05-17 16:21 ` Rafael J. Wysocki
2022-05-18 16:14 ` Sakari Ailus
2022-05-18 19:07 ` Rafael J. Wysocki
2022-05-18 19:41 ` Sakari Ailus
2022-05-19 18:05 ` Rafael J. Wysocki
2022-05-20 6:13 ` Sakari Ailus
2022-05-20 14:21 ` Shevchenko, Andriy [this message]
2022-05-06 13:00 ` [PATCH 03/11] ACPI: property: Tie data nodes to acpi handles Sakari Ailus
2022-05-06 13:00 ` [PATCH 04/11] ACPI: property: Use acpi_object_type consistently in property ref parsing Sakari Ailus
2022-05-06 13:00 ` [PATCH 05/11] ACPI: property: Move property ref argument parsing into a new function Sakari Ailus
2022-05-06 13:00 ` [PATCH 06/11] ACPI: property: Switch node property referencing from ifs to a switch Sakari Ailus
2022-05-06 13:00 ` [PATCH 07/11] ACPI: Initialise device child list early to access data nodes early Sakari Ailus
2022-05-06 13:28 ` Rafael J. Wysocki
2022-05-06 14:08 ` Sakari Ailus
2022-05-06 13:00 ` [PATCH 08/11] ACPI: property: Parse data node string references in properties Sakari Ailus
2022-05-06 13:00 ` [PATCH 09/11] ACPI: property: Unify integer value reading functions Sakari Ailus
2022-05-06 13:00 ` [PATCH 10/11] ACPI: property: Add support for parsing buffer property UUID Sakari Ailus
2022-05-06 13:00 ` [PATCH 11/11] ACPI: property: Read buffer properties as integers Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YoekBq6zKocR/mGy@smile.fi.intel.com \
--to=andriy.shevchenko@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.