From: Andi Shyti <andi.shyti@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: linux-next <linux-next@vger.kernel.org>
Subject: Re: Update i2c branches
Date: Thu, 2 Jul 2026 18:50:42 +0200 [thread overview]
Message-ID: <akaWcTjDlww10fsR@zenone.zhora.eu> (raw)
In-Reply-To: <117e594d-28b0-4bac-b245-66cf2ac6c0f7@sirena.org.uk>
Hi Mark,
> > Please include:
>
> > i2c/i2c
> > i2c/i2c-fixes
> > i2c/i2c-next
>
> > The latter is normally a merge of the first two so that it
> > doesn't create any conflict, but very often it contains more
> > patches needing some special dependencies.
>
> I'm not sure it is sensible for me to merge all three, if I pull both
> i2c and i2c-next then I'll end up having to redo all the conflict
> resolutions you've done in i2c-next. Potentially I'll get conflicts due
> to doing something slightly differently, or the additional stuff in
> i2c-next only overlapping with conflict resolutions. If i2c-next
> contains i2c it seems more sensible to get i2c via that instead and
> avoid the hassle?
OK, sure, you can also only include i2c-next.
Thanks a lot,
Andi
next prev parent reply other threads:[~2026-07-02 16:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-01 9:08 Update i2c branches Andi Shyti
2026-07-01 15:44 ` Mark Brown
2026-07-02 16:50 ` Andi Shyti [this message]
2026-07-02 18:11 ` Mark Brown
2026-07-01 15:50 ` Mark Brown
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=akaWcTjDlww10fsR@zenone.zhora.eu \
--to=andi.shyti@kernel.org \
--cc=broonie@kernel.org \
--cc=linux-next@vger.kernel.org \
/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