From: Andi Shyti <andi.shyti@kernel.org>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Igor Korotin <igor.korotin@linux.dev>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
rust-for-linux@vger.kernel.org,
Danilo Krummrich <dakr@kernel.org>,
Miguel Ojeda <ojeda@kernel.org>,
Wolfram Sang <wsa+renesas@sang-engineering.com>
Subject: Re: [GIT PULL] rust-i2c-next for 7.3
Date: Mon, 24 Aug 2026 13:45:53 +0200 [thread overview]
Message-ID: <aowtivMDF-Rp59Kz@zenone.zhora.eu> (raw)
In-Reply-To: <CAMuHMdXxosPBAAO-kTKRLDH3o8Cqsx8bf+G28qJxQmPuQXwwhQ@mail.gmail.com>
Hi Geert,
On Mon, Aug 24, 2026 at 09:54:09AM +0200, Geert Uytterhoeven wrote:
> On Mon, 24 Aug 2026 at 01:30, Andi Shyti <andi.shyti@kernel.org> wrote:
> > > No problem, rebased on i2c/i2c. Updated pull below.
> >
> > Thank you!
> >
> > > Thanks
> > > Igor
> > >
> > > The following changes since commit 7a79b02dd1b09c235c3cf6075bccca2160d1b826:
> > >
> > > i2c: rcar: fix reset handling for Gen5 (2026-08-19 22:07:13 +0200)
> > >
> > > are available in the Git repository at:
> > >
> > > https://github.com/ikrtn/linux.git tags/rust-i2c-for-7.3
> > >
> > > for you to fetch changes up to b5fa55ad007059547c9139d4c4872e158ae255f2:
> > >
> > > i2c: rust: mark I2cAdapter methods as inline (2026-08-22 12:22:27 +0100)
> >
> > merged to i2c/i2c.
>
> Apparently you merged both branches, now having the same commit twice:
>
> + 61ddec70c9bcc3d4 i2c: rust: mark I2cAdapter methods as inline
> + b5fa55ad00705954 i2c: rust: mark I2cAdapter methods as inline
>
> Gr{oetje,eeting}s,
Thanks for checking and letting me know!
It's in i2c/i2c-next (or next/master). I made the mistake of not
cleaning up the first merge before pushing the change. Since this
duplicate merge log will never reach mainline, I don't want to
rewrite the i2c-next branch history now. Everything will be reset
to mainline at 7.3-rc1 anyway.
Andi
prev parent reply other threads:[~2026-08-24 11:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-19 21:28 [GIT PULL] rust-i2c-next for 7.3 Igor Korotin
2026-08-20 19:26 ` Andi Shyti
2026-08-22 11:38 ` Igor Korotin
2026-08-22 12:24 ` Andi Shyti
2026-08-24 7:54 ` Geert Uytterhoeven
2026-08-24 11:45 ` Andi Shyti [this message]
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=aowtivMDF-Rp59Kz@zenone.zhora.eu \
--to=andi.shyti@kernel.org \
--cc=dakr@kernel.org \
--cc=geert@linux-m68k.org \
--cc=igor.korotin@linux.dev \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=wsa+renesas@sang-engineering.com \
/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