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 85140C433F5 for ; Tue, 12 Apr 2022 12:14:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348385AbiDLMQ2 (ORCPT ); Tue, 12 Apr 2022 08:16:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352924AbiDLMPw (ORCPT ); Tue, 12 Apr 2022 08:15:52 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 168208B6DB; Tue, 12 Apr 2022 04:16:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B2041B81CD0; Tue, 12 Apr 2022 11:16:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D552CC385A1; Tue, 12 Apr 2022 11:16:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649762171; bh=O1dHRmNJHk6atETn5sVKcrOo0eM+WqTM5zzDRoF33wc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=NLpDTV/X+UcbTaEcSLZxhab2tUhfFmsREEXa/ywh5kkZkklvEGEX5sPIirz091u2e uUe5nQFHEOO2kuy8oRS++xIfgKIspYZ13wJcmXpVr2Eq9kPTEPuLSaoTAb+qD42aHa AvFX777GbvnJzYkcqOxhuJZYX/qlyv84OZOkWH8wxWuHGsBB1h6rmZNctWr2/BsxxN wMKxswZYmUYRFwHNbILYdEAin7pgGf1VsDnAvrMbDz39iqy/tp+NWRDYRqHtQfxD+3 F4kivDhF/kSCig0vAILCugBo9MwS+Vvrec35/6Wu+Eo028xiksqizwPi5Qe129ucQh +yBjFSgvLjC0A== Date: Tue, 12 Apr 2022 16:46:07 +0530 From: Vinod Koul To: Stephen Rothwell Cc: Lad Prabhakar , Linux Kernel Mailing List , Linux Next Mailing List , Minghao Chi Subject: Re: linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree Message-ID: References: <20220412124219.3738092c@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220412124219.3738092c@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12-04-22, 12:42, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the dmaengine tree got a conflict in: > > drivers/dma/mediatek/mtk-hsdma.c > > between commit: > > 5cfde5b82f05 ("dmaengine: mediatek: mtk-hsdma: Use platform_get_irq() to get the interrupt") > > from the dmaengine-fixes tree and commit: > > bb40bb695ec8 ("dmaengine: mediatek: mtk-hsdma: Use platform_get_irq() to get the interrupt") > > from the dmaengine tree. Thanks, this should not be in fixes, I have fixed that up. > > I fixed it up (I arbitrarily used the former) 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 -- ~Vinod