From: Mark Brown <broonie@kernel.org>
To: Wolfram Sang <wsa@the-dreams.de>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Wolfram Sang <wsa@kernel.org>
Subject: Re: linux-next: manual merge of the spi tree with the i2c tree
Date: Tue, 21 Feb 2023 17:04:53 +0000 [thread overview]
Message-ID: <Y/T5tevqPapMy/g6@sirena.org.uk> (raw)
In-Reply-To: <Y/T4BTCCzIWzE1oe@imac101>
[-- Attachment #1: Type: text/plain, Size: 417 bytes --]
On Tue, Feb 21, 2023 at 05:57:41PM +0100, Alain Volmat wrote:
> should I update something to avoid this conflict before you push the
> pull request for v6.3 ?
No, it's fine.
Please don't top post, reply in line with needed context. This allows
readers to readily follow the flow of conversation and understand what
you are talking about and also helps ensure that everything in the
discussion is being addressed.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-02-21 17:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-16 0:30 linux-next: manual merge of the spi tree with the i2c tree Stephen Rothwell
2023-02-16 19:48 ` Alain Volmat
2023-02-17 0:12 ` Mark Brown
2023-02-21 9:11 ` Geert Uytterhoeven
2023-02-21 16:57 ` Alain Volmat
2023-02-21 17:04 ` Mark Brown [this message]
2023-02-23 0:58 ` 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=Y/T5tevqPapMy/g6@sirena.org.uk \
--to=broonie@kernel.org \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=wsa@kernel.org \
--cc=wsa@the-dreams.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox