From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48AEDC433EF for ; Tue, 10 May 2022 17:11:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347799AbiEJRPB (ORCPT ); Tue, 10 May 2022 13:15:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347803AbiEJRO7 (ORCPT ); Tue, 10 May 2022 13:14:59 -0400 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6374F27FD0; Tue, 10 May 2022 10:11:00 -0700 (PDT) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id D33485C0045; Tue, 10 May 2022 13:10:56 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 10 May 2022 13:10:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h=cc :cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1652202656; x=1652289056; bh=HxzRjIIRzl JxspnDZKB1ScUfiCVifzWE/sbK1AK17mI=; b=Z7uNt2mvZqdfVZMdEylQJ6GCNe rkY3yyr8dIbsKSlglonov6KbKloty7Qraru7XMPjQeczzl+Em6l4Baiw5Z5Igztt VChMDXZ6uKbqooAi9rfru4Ey8oZWYvrWN875ZunpRJic8hYsXmEFoAExHWNlR1EC ADVU/IXvnB9P4meMf2ELvmkj1Y37LrIivriTFZt/zuqRNyt7UdBYylNNw8MU/t+r 2kgepfssgQTP0UH9rJL8dQzDWvKyykofA7lIds718GDwv9QW1iZsrp7CXagtyAuR xeecZm56hh4GVpEbH6mzqoSwlt1/356HUo5FkZng2Owo3z78w9zXYzg1dIkQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1652202656; x= 1652289056; bh=HxzRjIIRzlJxspnDZKB1ScUfiCVifzWE/sbK1AK17mI=; b=T L3yPOCSgoJKzIC1VQRRqsu0ZXhfIw6y1Cmb/AaeCzp2x7/u00sE5VrEOuzq2zRKq BOmqj81Bz0Tmg234n+AyfCDlSm2kvczrzLXRF8/bYDL470XP8D23/+P+hwRFWrHo pxrriLOgIOQsGmhyJHuyy/U1l0N07fGsgyB9Xr73NAOM/RpCZGMK+EXnMS7HokOB juEIXDj8+2VqlZ5SyoGEPYSnTt3ekMf4MYNMjIUHOgroa4bZpFmNu/PGqx607Wpz xVib/zhW8lkvzAzBxz+RzUcdRvK5cjoWgQiNClwJgSVUSKj+ZB9XOS8FrD0dreQY SEG7Mnn/6lfgEZK4EQ7Jg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrgedugddutdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepheegvd evvdeljeeugfdtudduhfekledtiefhveejkeejuefhtdeufefhgfehkeetnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorg hhrdgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 10 May 2022 13:10:56 -0400 (EDT) Date: Tue, 10 May 2022 19:10:53 +0200 From: Greg KH To: Stephen Rothwell Cc: Jonathan Corbet , Catalin Marinas , Darren Hart , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the jc_docs tree with the driver-core.current tree Message-ID: References: <20220509110034.4fab2013@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220509110034.4fab2013@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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 > AMD Tom Lendacky > - IBM Z Christian Borntraeger > - IBM Power Anton Blanchard > + Ampere Darren Hart > - ARM Grant Likely > ++ ARM Catalin Marinas > + IBM Power Anton Blanchard > + IBM Z Christian Borntraeger > Intel Tony Luck > Qualcomm Trilok Soni > 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