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=-3.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 66779C433E0 for ; Fri, 17 Jul 2020 12:05:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 35CA5206BE for ; Fri, 17 Jul 2020 12:05:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="wSW9x2L6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726113AbgGQMFl (ORCPT ); Fri, 17 Jul 2020 08:05:41 -0400 Received: from m43-7.mailgun.net ([69.72.43.7]:45431 "EHLO m43-7.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725950AbgGQMFl (ORCPT ); Fri, 17 Jul 2020 08:05:41 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1594987540; h=Content-Type: MIME-Version: Message-ID: In-Reply-To: Date: References: Subject: Cc: To: From: Sender; bh=hPWgjh6Z31+8mVshXFtGOQtuU1a/Lut0EMPEI8zc8j4=; b=wSW9x2L6O1Yk1g6YTx7S06YBBJA9ej/otgvmlb3pyN/HvCiGUSh43BX0Ih/ydAx20UXmyl/e QK4nYNbROIqrXIqpxCSxUkOob+09gbVuU2hWmeRHS47GLjRaWH1tHwu9JAP0SHEqWl9Pbe7b 9G54lARhxeJwfPKfwGsJA93kUkI= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyJmNGRkZiIsICJsaW51eC1uZXh0QHZnZXIua2VybmVsLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n12.prod.us-west-2.postgun.com with SMTP id 5f119414166c1c54948c54e6 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Fri, 17 Jul 2020 12:05:40 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id D8807C43395; Fri, 17 Jul 2020 12:05:39 +0000 (UTC) Received: from potku.adurom.net (88-114-240-156.elisa-laajakaista.fi [88.114.240.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: kvalo) by smtp.codeaurora.org (Postfix) with ESMTPSA id 22D79C433C6; Fri, 17 Jul 2020 12:05:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 22D79C433C6 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=kvalo@codeaurora.org From: Kalle Valo To: Stephen Rothwell Cc: Vinod Koul , Wireless , Linux Next Mailing List , Linux Kernel Mailing List , Ludovic Desroches , Ajay Singh , Vladimir Oltean , "David S. Miller" Subject: Re: linux-next: manual merge of the dmaengine tree with the wireless-drivers-next and Linus' trees References: <20200717165336.312dcf09@canb.auug.org.au> Date: Fri, 17 Jul 2020 15:05:34 +0300 In-Reply-To: <20200717165336.312dcf09@canb.auug.org.au> (Stephen Rothwell's message of "Fri, 17 Jul 2020 16:53:36 +1000") Message-ID: <87tuy673e9.fsf@codeaurora.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org Stephen Rothwell writes: > Today's linux-next merge of the dmaengine tree got a conflict in: > > MAINTAINERS > > between commit: > > 5625f965d764 ("wilc1000: move wilc driver out of staging") > > from the wireless-drivers-next tree, commit: > > 6e701c299469 ("MAINTAINERS: merge entries for felix and ocelot drivers") > > from Linus' tree and commit: > > c3846c4cce15 ("MAINTAINERS: dmaengine: Microchip: add Tudor Ambarus > as co-maintainer") > > from the dmaengine tree. I think this is trivial enough that Linus can take care of it without any extra actions. Thanks for the report. -- https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches