linux-next: duplicate patch in the kunit-next tree

linux-next: duplicate patch in the kunit-next tree

[Stephen Rothwell]

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

Hi all,

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

  b285ba6f8cc1 ("kunit: test: Use an action wrapper instead of a cast")

This is commit

  1bddcf77ce66 ("kunit: test: Avoid cast warning when adding kfree() as an action")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the kunit-next tree

[Stephen Rothwell]

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

Hi all,

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

  425ae3ab5a1f ("list: test: add the missing MODULE_DESCRIPTION() macro")

This is commit

  245e5db4adaf ("lib/list_test: add the missing MODULE_DESCRIPTION() macro")

in the mm-nonmm-unstable branch of 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 kunit-next tree

[Shuah Khan]

Hi Andrew,

On 6/10/24 23:22, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the mm tree as a different commit (but
> the same patch):
> 
>    425ae3ab5a1f ("list: test: add the missing MODULE_DESCRIPTION() macro")
> > This is commit
> 
>    245e5db4adaf ("lib/list_test: add the missing MODULE_DESCRIPTION() macro")
> 
> in the mm-nonmm-unstable branch of the mm tree.
> 

Can you drop the patch from mm tree? It will help avoid merge conflicts
in case there are other KUnit patches that depend on this end up in
kunit-next.

thanks,
-- Shuah

Re: linux-next: duplicate patch in the kunit-next tree

[Andrew Morton]

On Mon, 17 Jun 2024 13:21:25 -0600 Shuah Khan <skhan@linuxfoundation.org> wrote:

> Hi Andrew,
> 
> On 6/10/24 23:22, Stephen Rothwell wrote:
> > Hi all,
> > 
> > The following commit is also in the mm tree as a different commit (but
> > the same patch):
> > 
> >    425ae3ab5a1f ("list: test: add the missing MODULE_DESCRIPTION() macro")
> > > This is commit
> > 
> >    245e5db4adaf ("lib/list_test: add the missing MODULE_DESCRIPTION() macro")
> > 
> > in the mm-nonmm-unstable branch of the mm tree.
> > 
> 
> Can you drop the patch from mm tree? It will help avoid merge conflicts
> in case there are other KUnit patches that depend on this end up in
> kunit-next.

I dropped this from mm.git on June 11.

linux-next: duplicate patch in the kunit-next tree

[Stephen Rothwell]

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

Hi all,

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

  875aec2357cd ("kunit: platform: Resolve 'struct completion' warning")

This is commit

  7687c66c18c6 ("kunit: platform: Resolve 'struct completion' warning")

in the driver-core tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patch in the kunit-next tree

[Greg KH]

On Mon, Jan 13, 2025 at 03:25:11PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the driver-core tree as a different commit
> (but the same patch):
> 
>   875aec2357cd ("kunit: platform: Resolve 'struct completion' warning")
> 
> This is commit
> 
>   7687c66c18c6 ("kunit: platform: Resolve 'struct completion' warning")
> 
> in the driver-core tree.

Thanks for letting me know.  Ugh, so many duplicates this development
cycle, probably due to delays in the holiday season...

sorry,

greg k-h

Re: linux-next: duplicate patch in the kunit-next tree

[Shuah Khan]

On 1/12/25 22:21, Greg KH wrote:
> On Mon, Jan 13, 2025 at 03:25:11PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> The following commit is also in the driver-core tree as a different commit
>> (but the same patch):
>>
>>    875aec2357cd ("kunit: platform: Resolve 'struct completion' warning")
>>
>> This is commit
>>
>>    7687c66c18c6 ("kunit: platform: Resolve 'struct completion' warning")
>>
>> in the driver-core tree.
> 
> Thanks for letting me know.  Ugh, so many duplicates this development
> cycle, probably due to delays in the holiday season...
> 
> sorry,
> 
> greg k-h

Greg,

I can drop this patch if it is better for this to go through
driver-core.

thanks,
-- Shuah

Re: linux-next: duplicate patch in the kunit-next tree

[Greg KH]

On Mon, Jan 13, 2025 at 03:45:34PM -0700, Shuah Khan wrote:
> On 1/12/25 22:21, Greg KH wrote:
> > On Mon, Jan 13, 2025 at 03:25:11PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > The following commit is also in the driver-core tree as a different commit
> > > (but the same patch):
> > > 
> > >    875aec2357cd ("kunit: platform: Resolve 'struct completion' warning")
> > > 
> > > This is commit
> > > 
> > >    7687c66c18c6 ("kunit: platform: Resolve 'struct completion' warning")
> > > 
> > > in the driver-core tree.
> > 
> > Thanks for letting me know.  Ugh, so many duplicates this development
> > cycle, probably due to delays in the holiday season...
> > 
> > sorry,
> > 
> > greg k-h
> 
> Greg,
> 
> I can drop this patch if it is better for this to go through
> driver-core.

I can't rebase my tree, so if you can drop it, that's ok with me
otherwise it's fine to leave the duplicate in there, your call.

thanks,

greg k-h