From: Greg KH <greg@kroah•com>
To: "Wysocki, Rafael J" <rafael.j.wysocki@intel•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
"Rafael J. Wysocki" <rjw@rjwysocki•net>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: duplicate patch in the driver-core tree
Date: Tue, 14 Feb 2023 17:59:51 +0100 [thread overview]
Message-ID: <Y+u+B/yi51JB26If@kroah.com> (raw)
In-Reply-To: <eade11f9-22a2-1e7b-93da-d52b63cf9a5f@intel.com>
On Tue, Feb 14, 2023 at 05:47:16PM +0100, Wysocki, Rafael J wrote:
>
> On 2/14/2023 7:46 AM, Greg KH wrote:
> > On Tue, Feb 14, 2023 at 12:57:00PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > The following commit is also in the pm tree as a different commit (but
> > > the same patch):
> > >
> > > a0bc3f78d0ff ("kernel/power/energy_model.c: fix memory leak with using debugfs_lookup()")
> > >
> > > This is commit
> > >
> > > a0e8c13ccd6a ("PM: EM: fix memory leak with using debugfs_lookup()")
> > >
> > > in the pm tree.
> > That will be fine, thanks for the warning.
>
> I can drop the EM change, though, if you are going to carry it.
When one branch adds it, and another adds and then removes it, and then
the two branches are merged, what is the result? The patch added, or
removed?
It's safer to just leave this as a duplicate, I know git can handle that
just fine.
thanks,
greg k-h
next prev parent reply other threads:[~2023-02-14 17:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-14 1:57 linux-next: duplicate patch in the driver-core tree Stephen Rothwell
2023-02-14 6:46 ` Greg KH
2023-02-14 16:47 ` Wysocki, Rafael J
2023-02-14 16:59 ` Greg KH [this message]
2023-02-20 12:16 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-02-20 2:38 Stephen Rothwell
2023-02-20 7:13 ` Greg KH
2023-12-18 4:40 Stephen Rothwell
2023-12-18 5:54 ` Andrew Morton
2023-12-18 6:35 ` Stephen Rothwell
2023-12-18 10:26 ` Greg KH
2025-04-30 7:47 Stephen Rothwell
2025-04-30 18:34 ` Rafael J. Wysocki
2025-04-30 18:56 ` Greg KH
2025-07-11 6:29 Stephen Rothwell
2025-07-11 6:48 ` Greg KH
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+u+B/yi51JB26If@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rafael.j.wysocki@intel$(echo .)com \
--cc=rjw@rjwysocki$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/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