Subject: Re: linux-next: manual merge of the jc_docs tree with the driver-core.current tree

From: Greg KH <[email-masked]>
Date: Tue, 10 May 2022 19:10:53 +0200

On Mon, May 09, 2022 at 11:00:34AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the jc_docs tree got a conflict in:
> 
>   Documentation/process/embargoed-hardware-issues.rst
> 
> between commit:
> 
>   8bf6e0e3c7de ("Documentation/process: Make groups alphabetical and use tabs consistently")
> 
> from the driver-core.current tree and commit:
> 
>   ca3d0b5dfc6b ("Documentation/process: Update ARM contact for embargoed hardware issues")
> 
> from the jc_docs tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc Documentation/process/embargoed-hardware-issues.rst
> index 98d7bc868f2a,41a2afaaea75..000000000000
> --- a/Documentation/process/embargoed-hardware-issues.rst
> +++ b/Documentation/process/embargoed-hardware-issues.rst
> @@@ -244,11 -244,10 +244,11 @@@ disclosure of a particular issue, unles
>   an involved disclosed party. The current ambassadors list:
>   
>     ============= ========================================================
>  -  ARM		Catalin Marinas <[email-masked]>
>     AMD		Tom Lendacky <[email-masked]>
>  -  IBM Z         Christian Borntraeger <[email-masked]>
>  -  IBM Power     Anton Blanchard <[email-masked]>
>  +  Ampere	Darren Hart <[email-masked]>
> -   ARM		Grant Likely <[email-masked]>
> ++  ARM		Catalin Marinas <[email-masked]>
>  +  IBM Power	Anton Blanchard <[email-masked]>
>  +  IBM Z		Christian Borntraeger <[email-masked]>
>     Intel		Tony Luck <[email-masked]>
>     Qualcomm	Trilok Soni <[email-masked]>
>   

I have applied the original to my tree now so as to remove the conflict
and get these changes to Linus for 5.18-final.

thanks,

greg k-h