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=-2.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH, USER_AGENT_MUTT autolearn=ham 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 9C723C43218 for ; Tue, 11 Jun 2019 10:11:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6800D212F5 for ; Tue, 11 Jun 2019 10:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560247885; bh=+ZDyPqWTovVVGCJsjzfmYX4FIQawCX/JqLFetsqmSfg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=TQwzrZLbDi4Q11xzDxPej41Zo3mPWL8yKKXj56NT08SfRccbIjmczOfFLmL4K9YuO muyWoAbzz8BVRCefwzvXQDHYP0IIK3tutP6YwWukqt0YtLavuNlG86tIn5dzYWtCjs k+V9OkDi+hkY5Rz/4VZGyn4/5aeDnXibVMN4lB+8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405178AbfFKKLY (ORCPT ); Tue, 11 Jun 2019 06:11:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:42684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404572AbfFKKLY (ORCPT ); Tue, 11 Jun 2019 06:11:24 -0400 Received: from localhost (unknown [171.76.113.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7EEE82089E; Tue, 11 Jun 2019 10:11:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560247884; bh=+ZDyPqWTovVVGCJsjzfmYX4FIQawCX/JqLFetsqmSfg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=sgXAMefrK5tfJhn0TOTRwbPA3aPeRGKpC8Os+Rlcj+vtaJfBtA8lKezFqTP0zXHUX Ojr8Ehpv20U2ow20OElGsDZjlzZCcO16+7l8cyh9GMcNG5PK0X6dNgaNg/0oaZxqVi ppDUpsAnIv+BySPEPbCZ8YttALi0guNheJRr9KuI= Date: Tue, 11 Jun 2019 15:38:15 +0530 From: Vinod Koul To: Stephen Rothwell Cc: Linux Next Mailing List , Linux Kernel Mailing List , Thomas Gleixner , Greg Kroah-Hartman , Simon Horman Subject: Re: linux-next: manual merge of the slave-dma tree with Linus' tree Message-ID: <20190611100815.GX9160@vkoul-mobl.Dlink> References: <20190611163246.6f90fba6@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190611163246.6f90fba6@canb.auug.org.au> User-Agent: Mutt/1.11.3 (2019-02-01) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On 11-06-19, 16:32, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the slave-dma tree got a conflict in: > > include/linux/sudmac.h > > between commit: > > 49833cbeafa4 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 311") > > from Linus' tree and commit: > > 9a0f780958bb ("dmaengine: sudmac: remove unused driver") > > from the slave-dma tree. > > I fixed it up (I removed the file) and can carry the fix as > necessary. This is now fixed as far as linux-next is concerned, but any Thanks Stephen, I will keep this in mind before I send this to Linus > 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