Received-SPF: pass (google.com: domain of linux-kernel+bounces-175929-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Fri, 10 May 2024 18:08:30 +0300
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
	Bartosz Golaszewski <brgl@bgdev.pl>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the
 gpio-brgl-fixes tree
Message-ID: <Zj44bgNE5Fav2Qfv@smile.fi.intel.com>
References: <20240510153212.246fbf31@canb.auug.org.au>
 <CACMJSev6EDeLdQ0e7A7f6AMhh08FznA67x5ONG+vSseC5QLt6A@mail.gmail.com>
 <20240510170827.2b655636@canb.auug.org.au>
 <20240510171049.2e0e3c56@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240510171049.2e0e3c56@canb.auug.org.au>
Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo

On Fri, May 10, 2024 at 05:10:49PM +1000, Stephen Rothwell wrote:
> On Fri, 10 May 2024 17:08:27 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > On Fri, 10 May 2024 08:33:37 +0200 Bartosz Golaszewski <bartosz.golaszewski@linaro.org> wrote:
> > >
> > > Thanks! I will send the fixes upstream today and then pull v6.9 into
> > > my tree before the merge window PR to fix this conflict.  
> > 
> > Or you could just merge your for-current branch into your for-next
> > branch and avoid possible issues with all the rest of v6.9 ...
> 
> Or, since it is a pretty simple conflict, just do not merge and just
> mention the conflict to Linus in your merge window PR.

I also would go the latest suggestion.

-- 
With Best Regards,
Andy Shevchenko