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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD325C433F5 for ; Fri, 20 May 2022 14:22:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233881AbiETOWI (ORCPT ); Fri, 20 May 2022 10:22:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350221AbiETOWE (ORCPT ); Fri, 20 May 2022 10:22:04 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7762166469 for ; Fri, 20 May 2022 07:22:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653056522; x=1684592522; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=IlQM99qMoOBV5PJlrUG89Chx3AY8uXcB59CoPPkNcqU=; b=EzCF2970vtCP1woXYZNj4k8AA32BpKnDhvzmTMEJuvl8624+aIm7n6Bl aDMWTOwQAoznYvXvylNMo4K86dYJc+/GX3DLQzRtdOKBZgsHh/W0fUIj1 O4R75TH3KiNbCkIkHyihMT7Qruetu6OZNDifnySxUw46FrSyBfnuVAgYT Z82vpfJa6MhK+eavCcHGO64mIcBhcVzfpiLBsgZI/NF9kbHzQDglfJ66f 6S7H7hoClkm/pq2M18JL/MwqQvA0OpkJsD0wp9JL0q6tmP8lAkCmjPZSC ToKL3nHY94VHRkXwo6KWTRtVeJxbDCAWXkFhadw64s/iVGvQmEvIXg//9 A==; X-IronPort-AV: E=McAfee;i="6400,9594,10353"; a="271436435" X-IronPort-AV: E=Sophos;i="5.91,239,1647327600"; d="scan'208";a="271436435" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2022 07:22:02 -0700 X-IronPort-AV: E=Sophos;i="5.91,239,1647327600"; d="scan'208";a="524666519" Received: from smile.fi.intel.com ([10.237.72.54]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2022 07:22:01 -0700 Received: from andy by smile.fi.intel.com with local (Exim 4.95) (envelope-from ) id 1ns3Vu-000GqW-O1; Fri, 20 May 2022 17:21:58 +0300 Date: Fri, 20 May 2022 17:21:58 +0300 From: "Shevchenko, Andriy" To: Sakari Ailus Cc: "Rafael J. Wysocki" , ACPI Devel Maling List Subject: Re: [PATCH 02/11] ACPI: acpica: Constify pathname argument for acpi_get_handle() Message-ID: References: <20220506130025.984026-1-sakari.ailus@linux.intel.com> <20220506130025.984026-3-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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