From patchwork Wed Nov 8 23:23:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 163177 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp106931vqs; Wed, 8 Nov 2023 15:24:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IHZ+nz4txFrnHNRYiHtq3yijZhWSNSDb3xFY5O78mVv7kSJ/4DPTZT4bkgDY90UGvb5AW85 X-Received: by 2002:a05:6871:3a11:b0:1cc:c744:d320 with SMTP id pu17-20020a0568713a1100b001ccc744d320mr4453951oac.53.1699485846684; Wed, 08 Nov 2023 15:24:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699485846; cv=none; d=google.com; s=arc-20160816; b=dw09EvHF4og34GhU2ajjfwcmJNO6r7TW2ji4PkT0KGWikn1VDcq436/KPhZrj3ebQH Z78mkba9smZaleWvtxF7O7NrPpUzbtaIxHit6vXTNDYkA32ITzz+C18hNETWPVVLBxLC e6lye0sNKKQcOl/Af4RO2U0W8ohTNXVYpkKEiJz0ZDdH9EJo82qTQU/1kIACN9C21JBc SFedOkx+cz12rYqmu3HJNZ5Scwv/8qDio1hTc7yyPDoSJk3maHJYGyzXgDy0rt2jCSzk PyIf4IPL4vhqI8Ikn/QRG0tVdTS4klbo7qzWxg90Xyudjg6A4GVlaYBWbOZOpv3gvcs0 EY4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=8fsIunIAE5KCLBd5LIZzuFBkZLYZH+YNTQP+e9AX4as=; fh=OBC+AT2r9NJU1YcvC+Xr0OyqiE7anJ7glPjChax27tU=; b=amXHreJa9Xaii6tk+jxzc5FQfnPql71K/qIbP5opdP09TG4fCC8Y5xMm88ucGp4Olh Cvaa10oIFj3os0Qi+31jjTh57Ne/z+3rxs8Z1p8QUqEgpalDMHvSXhkaMCT66CXoLP6q FcSa2bXtgO5hSQwjLo6T2tlxo1KWD8/SOL5oALYdv+qFAjyKvC6JO7spWt6IbMOm7FzQ JpkRdorMDBPSRA/3UH/lpIlGsD5onanyjVhsTfTMIsH1p4sAT3EOGPGWtptOjcFnF/0g pYSe+8DA14FpELH5Udzu5iNeBubhIrkaAsAYFUKyNlEqTkzUq/u9oftJWheaZc1Atd44 uMLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=PhllRnjQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id bz35-20020a056a02062300b005acd2009192si6435448pgb.13.2023.11.08.15.24.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 15:24:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=PhllRnjQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 7707380E4A3D; Wed, 8 Nov 2023 15:24:04 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230462AbjKHXXo (ORCPT + 32 others); Wed, 8 Nov 2023 18:23:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229566AbjKHXXm (ORCPT ); Wed, 8 Nov 2023 18:23:42 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CC5B25B1; Wed, 8 Nov 2023 15:23:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1699485818; bh=8fsIunIAE5KCLBd5LIZzuFBkZLYZH+YNTQP+e9AX4as=; h=Date:From:To:Cc:Subject:From; b=PhllRnjQ4h7Sl1+96vZbjSbUsknFj150zIWbjn4vKbhvTBAGKevPb0Jbldb2e5YQX 2bAl8C/QCJyBt/b6Dlw2EcV987hycRcfzt3KZ6A/vDmWAmyhDT/Nh90Jhim9OoGzBJ X8ysacOqgMguKOF4RBckQA9Ioji6IEoftFj/DvVbL5nv6k0Pxd7P8Mp24NImTZZgi4 X7M5cAZBxzfLXUjiOqxk2SJt3zO6h5MVuayAdmEsl+iFYRG4iuTS+xh8TL2eTIuBYj 0o7AUUutU1u3JSHJlKFLQAmjJmAgSlOsZW5TudPUNCsKPO0hLbWPJkNjWsYmr11/02 FjHWfy/5TKS9Q== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SQh3Z4gBZz4xSY; Thu, 9 Nov 2023 10:23:37 +1100 (AEDT) Date: Thu, 9 Nov 2023 10:23:35 +1100 From: Stephen Rothwell To: Huacai Chen Cc: Hengqi Chen , Huacai Chen , Linux Kernel Mailing List , Linux Next Mailing List , Tianrui Zhao Subject: linux-next: manual merge of the loongarch tree with Linus' tree Message-ID: <20231109102335.79b6bf50@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 08 Nov 2023 15:24:04 -0800 (PST) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782040071258160817 X-GMAIL-MSGID: 1782040071258160817 Hi all, Today's linux-next merge of the loongarch tree got a conflict in: arch/loongarch/include/asm/inst.h between commit: 81efe043a351 ("LoongArch: KVM: Implement handle iocsr exception") from Linus' tree and commit: add28024405e ("LoongArch: Add more instruction opcodes and emit_* helpers") from the loongarch 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. diff --cc arch/loongarch/include/asm/inst.h index 008a88ead60d,5350ae9ee380..000000000000 --- a/arch/loongarch/include/asm/inst.h