From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="BxqwjqXY" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61611C2; Mon, 11 Dec 2023 06:48:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702306121; x=1733842121; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=EtQXmTGLtgY5zDIntByKtT6Px6kjcnXXrK7DALzvv84=; b=BxqwjqXY/BEbAtSara1Dbg25U1x9gQccmqiOqpV9tz4gv0qFwJ0as6zU fRQnEZQZKTXjl1HS2X+DQMmRalzOoZPiN4fU5hhx/qKrvFo9qm3cnI1oc Dtn+3wUukHmuY2S7ekEP2ITooy66i/wb85cDcXbaoBTvxE5Vv4y1EuYZv u+DSDlnqGpRDutuLEBD5YRpBuWs25v6riSzqgUQpdHaGcFCZp7fSKpVqo TDEMlW7CUEOM95h++LZx9rPv4auC1xa2Th/K/q2pWhWsgc/XtVYB0wHjk Je6j/8/Oy7krSBIpyNLo1WpGkmaJTaZ+FD0Y82pd/GiZE65lGAig2ostv A==; X-IronPort-AV: E=McAfee;i="6600,9927,10921"; a="1465783" X-IronPort-AV: E=Sophos;i="6.04,268,1695711600"; d="scan'208";a="1465783" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Dec 2023 06:48:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10921"; a="891152499" X-IronPort-AV: E=Sophos;i="6.04,268,1695711600"; d="scan'208";a="891152499" Received: from smile.fi.intel.com ([10.237.72.54]) by fmsmga002.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Dec 2023 06:48:39 -0800 Received: from andy by smile.fi.intel.com with local (Exim 4.97) (envelope-from ) id 1rChaG-000000052ak-3tG2; Mon, 11 Dec 2023 16:48:36 +0200 Date: Mon, 11 Dec 2023 16:48:36 +0200 From: Andy Shevchenko To: Bartosz Golaszewski Cc: Linus Walleij , Stephen Rothwell , Bartosz Golaszewski , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the pinctrl-intel tree with the gpio-brgl tree Message-ID: References: <20231211145056.23fbfd7d@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 On Mon, Dec 11, 2023 at 03:04:09PM +0100, Bartosz Golaszewski wrote: > On Mon, 11 Dec 2023 at 14:40, Andy Shevchenko > wrote: > > On Mon, Dec 11, 2023 at 09:15:30AM +0100, Bartosz Golaszewski wrote: > > > On Mon, 11 Dec 2023 at 04:51, Stephen Rothwell wrote: > > > > > > Today's linux-next merge of the pinctrl-intel tree got a conflict in: > > > > > > > > drivers/pinctrl/intel/pinctrl-baytrail.c > > > > > > > > between commit: > > > > > > > > c73505c8a001 ("pinctrl: baytrail: use gpiochip_dup_line_label()") > > > > > > > > from the gpio-brgl tree and commit: > > > > > > > > 6191e49de389 ("pinctrl: baytrail: Simplify code with cleanup helpers") > > > > > > > > from the pinctrl-intel tree. ... > > > Andy, please pull the following into your baytrail tree: > > > https://lore.kernel.org/lkml/20231208083650.25015-1-brgl@bgdev.pl/ > > > > I can do it, but why? > > You were the one who asked me to put these commits into an immutable > branch in the first place to avoid conflicts with the baytrail branch. > :) True with the caveat like (citing by memory): "I see no conflicts with the code that needs this PR to be pulled, but just in case." So, thank you for PR, but there is nothing pending in my tree that requires this PR to be pulled. So, when I send the PR to Linus W. (presumably end of this week) it will be solved on his level, I believe. > > Conflicts is a normal practice during kernel development. And I believe this > > particular one will be solved by Linus W. > > > > Stephen, resolution looks correct to me, thank you. -- With Best Regards, Andy Shevchenko