From: Wolfram Sang <wsa@kernel.org>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev@lists.ozlabs.org, linux-i2c@vger.kernel.org,
kernel@pengutronix.de, kernel test robot <lkp@intel.com>
Subject: Re: [PATCH] macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change
Date: Fri, 16 Sep 2022 19:46:35 +0100 [thread overview]
Message-ID: <YyTEi++70eURjXpQ@shikoro> (raw)
In-Reply-To: <20220916090802.261279-1-u.kleine-koenig@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 495 bytes --]
> I don't know how to proceed with this fix. Squashing into the broken
> commit is out of the game as the commit is on a stable branch that is
> already merged in a few trees. Maybe let it go in via the i2c tree?
I think it would be simplest if I put it on top of my for-next branch.
The other option is that PPC pulls the immutable branch
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/make_remove_callback_void-immutable
and then applies this patch on top. I don't mind.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Wolfram Sang <wsa@kernel.org>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: linuxppc-dev@lists.ozlabs.org, linux-i2c@vger.kernel.org,
kernel@pengutronix.de, kernel test robot <lkp@intel.com>
Subject: Re: [PATCH] macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change
Date: Fri, 16 Sep 2022 19:46:35 +0100 [thread overview]
Message-ID: <YyTEi++70eURjXpQ@shikoro> (raw)
In-Reply-To: <20220916090802.261279-1-u.kleine-koenig@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 495 bytes --]
> I don't know how to proceed with this fix. Squashing into the broken
> commit is out of the game as the commit is on a stable branch that is
> already merged in a few trees. Maybe let it go in via the i2c tree?
I think it would be simplest if I put it on top of my for-next branch.
The other option is that PPC pulls the immutable branch
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/make_remove_callback_void-immutable
and then applies this patch on top. I don't mind.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2022-09-16 18:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-16 9:08 [PATCH] macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change Uwe Kleine-König
2022-09-16 18:46 ` Wolfram Sang [this message]
2022-09-16 18:46 ` Wolfram Sang
2022-09-17 6:33 ` Michael Ellerman
2022-09-17 18:38 ` Wolfram Sang
2022-09-17 18:38 ` Wolfram Sang
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=YyTEi++70eURjXpQ@shikoro \
--to=wsa@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=kernel@pengutronix.de \
--cc=linux-i2c@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lkp@intel.com \
--cc=u.kleine-koenig@pengutronix.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 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.