From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Joel Stanley <joel@jms•id.au>
Cc: Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
ARM <linux-arm-kernel@lists•infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: duplicate patches in the aspeed tree
Date: Fri, 18 Aug 2023 13:21:02 +1000 [thread overview]
Message-ID: <20230818132102.11ef3fea@canb.auug.org.au> (raw)
In-Reply-To: <CACPK8Xez-xQDEAG_JuN5VqMVBreLWO_Qhu+3Vq3EA1PiebR5hw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
Hi Joel,
On Fri, 18 Aug 2023 02:19:11 +0000 Joel Stanley <joel@jms•id.au> wrote:
>
> On Tue, 15 Aug 2023 at 01:41, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > The following commits are also in the arm-soc-fixes tree as different
> > commits (but the same patches):
> >
> > 0955e3867b54 ("soc: aspeed: socinfo: Add kfree for kstrdup")
> > c5835b6e7aff ("soc: aspeed: uart-routing: Use __sysfs_match_string")
> >
> > These are commits
> >
> > 6e6d847a8ce1 ("soc: aspeed: socinfo: Add kfree for kstrdup")
> > e4ad279ae345 ("soc: aspeed: uart-routing: Use __sysfs_match_string")
> >
> > in the arm-soc-fixes tree.
>
> This is expected as I sent the changes as patches for Arnd to merge
> via the soc tree.
>
> What would you like to see when this happens? Should I rebase them out
> of the aspeed tree?
They are currently not causing any conflicts (that I would need to
manually fix up), so you can just leave them it you like.
More generally, they could have gone into a separate branch that you
merge and you ask Arnd to merge so that we only have one copy. In
particular, quite a few people have a separate "-fixes" branch for
current release bug fixes.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-08-18 3:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-15 1:41 linux-next: duplicate patches in the aspeed tree Stephen Rothwell
2023-08-18 2:19 ` Joel Stanley
2023-08-18 3:21 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-22 1:30 Stephen Rothwell
2025-05-22 1:40 ` Stephen Rothwell
2023-02-01 21:47 Stephen Rothwell
2023-01-04 21:33 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=20230818132102.11ef3fea@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=joel@jms$(echo .)id.au \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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