linux-next: duplicate patch in the tip tree

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  c53cbc54ccff ("x86/iommu/docs: Update AMD IOMMU specification document URL")

This is commit

  73c5f76ecbdb ("x86/iommu/docs: Update AMD IOMMU specification document URL")

in the jc_docs tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Jonathan Corbet]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> The following commit is also in the jc_docs tree as a different commit
> (but the same patch):
>
>   c53cbc54ccff ("x86/iommu/docs: Update AMD IOMMU specification document URL")
>
> This is commit
>
>   73c5f76ecbdb ("x86/iommu/docs: Update AMD IOMMU specification document URL")
>
> in the jc_docs tree.

Hmm...I thought I even checked for that.  No worries, I can drop my
copy.

Thanks,

jon

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

[Ingo Molnar]

* Jonathan Corbet <corbet@lwn.net> wrote:

> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 
> > Hi all,
> >
> > The following commit is also in the jc_docs tree as a different commit
> > (but the same patch):
> >
> >   c53cbc54ccff ("x86/iommu/docs: Update AMD IOMMU specification document URL")
> >
> > This is commit
> >
> >   73c5f76ecbdb ("x86/iommu/docs: Update AMD IOMMU specification document URL")
> >
> > in the jc_docs tree.
> 
> Hmm...I thought I even checked for that.  No worries, I can drop my
> copy.

I'm pretty sure it was me who added the duplicate - sorry about that!

Thanks,

	Ingo

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  e0a1284b293b ("time/kunit: Use correct format specifier")

This is commit

  133e267ef4a2 ("time: test: Fix incorrect format specifier")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  b7a7ce1bb77b ("vdso/timens: Always provide arch_get_vdso_data() prototype for vdso")

This is commit

  0361c2513d36 ("time_namespace: always provide arch_get_vdso_data() prototype for vdso")

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 tip tree

[Andrew Morton]

On Fri, 2 Jun 2023 13:04:23 +1000 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):
> 
>   b7a7ce1bb77b ("vdso/timens: Always provide arch_get_vdso_data() prototype for vdso")
> 
> This is commit
> 
>   0361c2513d36 ("time_namespace: always provide arch_get_vdso_data() prototype for vdso")
> 
> in the mm tree.

Thanks.  I think I'll leave things as-is - both trees want the patch.

linux-next: duplicate patch in the tip tree

[Stephen Rothwell]

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

Hi all,

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

  379af13b31fa ("docs: locking: Discourage from calling disable_irq() in atomic")

This is commit

  ac6fadf4aa60 ("docs: kernel-hacking: discourage from calling disable_irq() in atomic")

in the jc_docs tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Jonathan Corbet]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> The following commit is also in the jc_docs tree as a different commit
> (but the same patch):
>
>   379af13b31fa ("docs: locking: Discourage from calling disable_irq() in atomic")
>
> This is commit
>
>   ac6fadf4aa60 ("docs: kernel-hacking: discourage from calling disable_irq() in atomic")
>
> in the jc_docs tree.

I'm sure I checked before applying that ... I guess maybe not.  I've
disappeared it now, thanks.

jon

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

[Stephen Rothwell]

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

Hi Jon,

On Fri, 13 Jan 2023 09:27:38 -0700 Jonathan Corbet <corbet@lwn.net> wrote:
>
> I'm sure I checked before applying that ... I guess maybe not.  I've
> disappeared it now, thanks.

You may well have checked, both commits appeared in linux-next for the
first time yesterday.

-- 
Cheers,
Stephen Rothwell

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