Feedback-ID: i787e41f1:Fastmail
Date:   Tue, 14 Feb 2023 17:59:51 +0100
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
Message-ID: <Y+u+B/yi51JB26If@kroah.com>
References: <20230214125700.606a89d7@canb.auug.org.au>
 <Y+suRQBtzCWx+mjo@kroah.com>
 <eade11f9-22a2-1e7b-93da-d52b63cf9a5f@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <eade11f9-22a2-1e7b-93da-d52b63cf9a5f@intel.com>
Precedence: bulk

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