linux-next: duplicate patch in the driver-core tree

linux-next: duplicate patch in the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

Hi all,

The following commit is also in the mm tree as a different commit (but
the same patch):

  2678fd2fe9ee ("initramfs: Expose retained initrd as sysfs file")

This is commit

  426081603f6c ("initramfs: expose retained initrd as sysfs file")

in the mm tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the driver-core tree

[Andrew Morton]

On Mon, 18 Dec 2023 15:40:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> The following commit is also in the mm tree as a different commit (but
> the same patch):
> 
>   2678fd2fe9ee ("initramfs: Expose retained initrd as sysfs file")
> 
> This is commit
> 
>   426081603f6c ("initramfs: expose retained initrd as sysfs file")
> 
> in the mm tree.

I'm suspecting that something went wrong here?

Re: linux-next: duplicate patch in the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 658 bytes --]

Hi Andrew,

On Sun, 17 Dec 2023 21:54:29 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Mon, 18 Dec 2023 15:40:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > The following commit is also in the mm tree as a different commit (but
> > the same patch):
> > 
> >   2678fd2fe9ee ("initramfs: Expose retained initrd as sysfs file")
> > 
> > This is commit
> > 
> >   426081603f6c ("initramfs: expose retained initrd as sysfs file")
> > 
> > in the mm tree.  
> 
> I'm suspecting that something went wrong here?

Like what?  You and Greg have applied the same patch.  It happens.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the driver-core tree

[Greg KH]

On Mon, Dec 18, 2023 at 05:35:06PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
> 
> On Sun, 17 Dec 2023 21:54:29 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > On Mon, 18 Dec 2023 15:40:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > > The following commit is also in the mm tree as a different commit (but
> > > the same patch):
> > > 
> > >   2678fd2fe9ee ("initramfs: Expose retained initrd as sysfs file")
> > > 
> > > This is commit
> > > 
> > >   426081603f6c ("initramfs: expose retained initrd as sysfs file")
> > > 
> > > in the mm tree.  
> > 
> > I'm suspecting that something went wrong here?
> 
> Like what?  You and Greg have applied the same patch.  It happens.

Yeah, sorry about that, git should be able to handle this fine.

greg k-h

linux-next: duplicate patch in the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

Hi all,

The following commit is also in the pm and opp trees as a different commit
(but the same patch):

  9f467f6375af ("OPP: fix error checking in opp_migrate_dentry()")

This is commit

  eca4c0eea534 ("OPP: fix error checking in opp_migrate_dentry()")

in the pm and opp trees.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the driver-core tree

[Greg KH]

On Mon, Feb 20, 2023 at 01:38:47PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the pm and opp trees as a different commit
> (but the same patch):
> 
>   9f467f6375af ("OPP: fix error checking in opp_migrate_dentry()")
> 
> This is commit
> 
>   eca4c0eea534 ("OPP: fix error checking in opp_migrate_dentry()")
> 
> in the pm and opp trees.

Thanks for the note, this should be fine, I didn't realize it ended up
in the opp tree as well, sorry about that.

greg k-h

linux-next: duplicate patch in the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 341 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the driver-core tree

[Greg KH]

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.

greg k-h

Re: linux-next: duplicate patch in the driver-core tree

[Wysocki, Rafael J]

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.

Cheers!

Re: linux-next: duplicate patch in the driver-core tree

[Greg KH]

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

Re: linux-next: duplicate patch in the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1477 bytes --]

Hi Greg,

On Tue, 14 Feb 2023 17:59:51 +0100 Greg KH <greg@kroah.com> wrote:
>
> 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?

Well, as far as git is concerned that is as if one side did nothing and
the other added the patch.  So the resolution would be the patch added.
This could still possibly be not what you want, though.

> It's safer to just leave this as a duplicate, I know git can handle that
> just fine.

In a simple case when no further conflicting changes occur, that is
fine.  I have been getting quite a few (especially today) where that is
not the case, however.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]