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
Date: Fri, 10 May 2024 18:08:30 +0300 [thread overview]
Message-ID: <Zj44bgNE5Fav2Qfv@smile.fi.intel.com> (raw)
In-Reply-To: <20240510171049.2e0e3c56@canb.auug.org.au>
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
next prev parent reply other threads:[~2024-05-10 15:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-10 5:32 linux-next: manual merge of the gpio-brgl tree with the gpio-brgl-fixes tree Stephen Rothwell
2024-05-10 6:33 ` Bartosz Golaszewski
2024-05-10 7:08 ` Stephen Rothwell
2024-05-10 7:10 ` Stephen Rothwell
2024-05-10 15:08 ` Andy Shevchenko [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-30 19:58 Mark Brown
2025-03-14 5:06 Stephen Rothwell
2025-03-14 9:57 ` Bartosz Golaszewski
2025-03-03 5:57 Stephen Rothwell
2025-03-03 8:33 ` Bartosz Golaszewski
2023-10-19 5:06 Stephen Rothwell
2023-10-19 8:41 ` Bartosz Golaszewski
2021-01-20 2:51 Stephen Rothwell
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=Zj44bgNE5Fav2Qfv@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bartosz.golaszewski@linaro.org \
--cc=brgl@bgdev.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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.