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 X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7942CC4338F for ; Tue, 27 Jul 2021 18:02:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6061D60EB2 for ; Tue, 27 Jul 2021 18:02:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231759AbhG0SCN (ORCPT ); Tue, 27 Jul 2021 14:02:13 -0400 Received: from mga17.intel.com ([192.55.52.151]:50466 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229915AbhG0SCL (ORCPT ); Tue, 27 Jul 2021 14:02:11 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10058"; a="192779273" X-IronPort-AV: E=Sophos;i="5.84,274,1620716400"; d="scan'208";a="192779273" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2021 11:02:09 -0700 X-IronPort-AV: E=Sophos;i="5.84,274,1620716400"; d="scan'208";a="437414256" Received: from djiang5-mobl1.amr.corp.intel.com (HELO [10.213.177.99]) ([10.213.177.99]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jul 2021 11:02:09 -0700 Subject: Re: linux-next: manual merge of the dmaengine tree with the driver-core tree To: Vinod Koul , =?UTF-8?Q?Uwe_Kleine-K=c3=b6nig?= Cc: Stephen Rothwell , Greg KH , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List References: <20210723155354.082a62d8@canb.auug.org.au> <20210723091641.zse42sotjt2pqiif@pengutronix.de> From: Dave Jiang Message-ID: Date: Tue, 27 Jul 2021 11:02:08 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 7/27/2021 6:44 AM, Vinod Koul wrote: > On 23-07-21, 11:16, Uwe Kleine-König wrote: >> Hello, >> >> On Fri, Jul 23, 2021 at 03:53:54PM +1000, Stephen Rothwell wrote: >>> Hi all, >>> >>> Today's linux-next merge of the dmaengine tree got a conflict in: >>> >>> drivers/dma/idxd/sysfs.c >>> >>> between commit: >>> >>> fc7a6209d571 ("bus: Make remove callback return void") >>> >>> from the driver-core tree and commit: >>> >>> d9e5481fca74 ("dmaengine: dsa: move dsa_bus_type out of idxd driver to standalone") >>> >>> from the dmaengine tree. >> Greg provided a tag for this case at >> >> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/bus_remove_return_void-5.15 >> >> . Vinod might want to rebase on top of this or merge it into his tree >> with Stephen's conflict resolution. > Thanks I have merged the tag and resolved conflict as above. > > Dave pls test Tested. Looks good. Thx. >