From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Jonathan Corbet <corbet@lwn•net>,
Catalin Marinas <catalin.marinas@arm•com>,
Darren Hart <darren@os•amperecomputing.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the jc_docs tree with the driver-core.current tree
Date: Tue, 10 May 2022 19:10:53 +0200 [thread overview]
Message-ID: <YnqcnT0axEXMelfd@kroah.com> (raw)
In-Reply-To: <20220509110034.4fab2013@canb.auug.org.au>
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 <catalin.marinas@arm•com>
> AMD Tom Lendacky <tom.lendacky@amd•com>
> - IBM Z Christian Borntraeger <borntraeger@de•ibm.com>
> - IBM Power Anton Blanchard <anton@linux•ibm.com>
> + Ampere Darren Hart <darren@os•amperecomputing.com>
> - ARM Grant Likely <grant.likely@arm•com>
> ++ ARM Catalin Marinas <catalin.marinas@arm•com>
> + IBM Power Anton Blanchard <anton@linux•ibm.com>
> + IBM Z Christian Borntraeger <borntraeger@de•ibm.com>
> Intel Tony Luck <tony.luck@intel•com>
> Qualcomm Trilok Soni <tsoni@codeaurora•org>
>
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
next prev parent reply other threads:[~2022-05-10 17:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 1:00 linux-next: manual merge of the jc_docs tree with the driver-core.current tree Stephen Rothwell
2022-05-10 17:10 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-03-24 0:46 Stephen Rothwell
2023-03-24 6:38 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YnqcnT0axEXMelfd@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=corbet@lwn$(echo .)net \
--cc=darren@os$(echo .)amperecomputing.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox