Re: [PATCH 02/11] ACPI: acpica: Constify pathname argument for acpi_get_handle()

Shevchenko, Andriy
2022-05-20T14:22:09Z

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