From: Mark Brown <broonie@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Wolfram Sang <wsa@the-dreams.de>,
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: Fri, 17 Feb 2023 00:12:06 +0000 [thread overview]
Message-ID: <Y+7GVqNu2ED2xhhR@sirena.org.uk> (raw)
In-Reply-To: <Y+6IcubsNszRK/59@imac101>
[-- Attachment #1: Type: text/plain, Size: 364 bytes --]
On Thu, Feb 16, 2023 at 08:48:02PM +0100, Alain Volmat wrote:
> Hi,
>
> sorry for the mistake. I should have made a serie with those
> 2 patches in order to avoid this conflict. Sorry about that.
> I know now for a next case.
This sort of trivial add/add change is generally not a problem,
it's just good for the people sending the trees to be aware.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-02-17 0:12 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 [this message]
2023-02-21 9:11 ` Geert Uytterhoeven
2023-02-21 16:57 ` Alain Volmat
2023-02-21 17:04 ` Mark Brown
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+7GVqNu2ED2xhhR@sirena.org.uk \
--to=broonie@kernel.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