From patchwork Mon Jun 19 03:14:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 109713 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2754883vqr; Sun, 18 Jun 2023 20:37:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Ok2lG3XOKadzg7eO3Ju7wCUqdFUI9V4lxi6T3/D8K2iAYB32wYogYl79EZKZXiK2yj1vE X-Received: by 2002:ac8:5a83:0:b0:3ff:2192:b007 with SMTP id c3-20020ac85a83000000b003ff2192b007mr1245286qtc.11.1687145824773; Sun, 18 Jun 2023 20:37:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687145824; cv=none; d=google.com; s=arc-20160816; b=VoF6R1zFP2X8vJ1txVZdG3fAl8lVipMXxOeEgHfJcLgnwDCjHZ9FJoJ7LlesXXduka PSEkbIrBvtzGITWyRdY9pMn/3pW7lwzZcFDigz70TGy5jiQyISJugWwMJBg0Brx5vwgs F/bBmBqSLZtwIuC6MOJwQ9JzexdKm8XNqEajRPNlwwDwM9/Iu14M7keqdDXPM6ZRml+N g+lK7Rfuq4OSJNLcggq4BZ/rZReuuPxLcZmxvB+oBc1LWKoRjK2iVQN8lH2pPJ4QPIrr 3FhobW33Hrls5E2HytwXqNYx0nEdTJittLnkGz6gjPyONJyEr9HMhK5olvJuuXOs6ejs PqLQ== 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=VCYuTV/HoM9gCib5rBxVEAKMTPetL6gniafe4VOF73A=; b=PbF6lZzYOq5oYJZHABUtGkOF7uLjEvT0T1mnoJme9pmNHINSI7uVezfrL5IiaAhKpe KRxxCYN50i6dI4AEaOjaIfLlGGEnub0WDiFOqLR50rhaFrcJ2RSwxhfP8Cx7r98GmcfH kCl8wPGZqgMGiaEVxJz4x7xF4PlwN3nhVk1EZzciHmOnlZSEqWf5FmPOONwxuQcd3ZHj 4Fp/EsNSCkBTyzAmSrlvRHL1XXat5ek5OpCTMNrEXm27AFFXYNYuprFM0UokyOBoGrCX ezeZb3hQ91bheou11Oxm9bU5pBfOIn59M8ddFpxX/MSfSz8MMNlpgCFiIjMfcf/qnzCH TErQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Nc5PDclX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 2-20020a621902000000b00652dbdb97d5si5312362pfz.356.2023.06.18.20.36.51; Sun, 18 Jun 2023 20:37:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Nc5PDclX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229641AbjFSDPF (ORCPT + 99 others); Sun, 18 Jun 2023 23:15:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229565AbjFSDPD (ORCPT ); Sun, 18 Jun 2023 23:15:03 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC0439E; Sun, 18 Jun 2023 20:15:00 -0700 (PDT) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QkvyR1qchz4wjD; Mon, 19 Jun 2023 13:14:54 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687144496; bh=VCYuTV/HoM9gCib5rBxVEAKMTPetL6gniafe4VOF73A=; h=Date:From:To:Cc:Subject:From; b=Nc5PDclXw/YfciOFRe9XPmMzhHt0HPoOJ7r9YBhRtLYP3VCo9Nes6C/fAiEijxeUQ OjYuyxN9zkWG9gtMD/KmTJ9UILwtybVdS33ylxJFJAmEj40temuNLlWvxLhkswi9n3 sYz+M5IHIyATZPR9ejAyRdETMZE1fjHt2H0/ILMKideUk57a987JHN4coikumAs2zz 1MexZPDdKUdiOxW8t1Tu1Ll0PB/ZBgHNXSt+YVMkC+PaOu677PFvKA63bgHZlAblcu sHzHheLVeMr/pGd6sBmSNdaO/6+BnrRc6H2hQFEIh3LvdXTg56nwtxDtGqb5vbGApG 12rMPcDPkRKVw== Date: Mon, 19 Jun 2023 13:14:53 +1000 From: Stephen Rothwell To: James Bottomley , Jens Axboe Cc: Keith Busch , Linux Kernel Mailing List , Linux Next Mailing List , "Martin K. Petersen" , Max Gurtovoy , Mike Christie Subject: linux-next: manual merge of the scsi tree with the block tree Message-ID: <20230619131453.25bf2153@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SORTED_RECIPS,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769100620093059852?= X-GMAIL-MSGID: =?utf-8?q?1769100620093059852?= Hi all, Today's linux-next merge of the scsi tree got a conflict in: drivers/nvme/host/Makefile between commit: 942e21c042e6 ("nvme: move sysfs code to a dedicated sysfs.c file") from the block tree and commit: b668f2f5467c ("nvme: Move pr code to it's own file") from the scsi 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 drivers/nvme/host/Makefile index d3fc5063e4be,06c18a65da99..000000000000 --- a/drivers/nvme/host/Makefile