From patchwork Fri Jul 17 06:53:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11669205 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3773113B1 for ; Fri, 17 Jul 2020 06:53:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1B8BE20734 for ; Fri, 17 Jul 2020 06:53:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="HVSNQOpL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726603AbgGQGxm (ORCPT ); Fri, 17 Jul 2020 02:53:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726180AbgGQGxm (ORCPT ); Fri, 17 Jul 2020 02:53:42 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF4A2C061755; Thu, 16 Jul 2020 23:53:41 -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 4B7MKF4Q8Vz9sRN; Fri, 17 Jul 2020 16:53:37 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1594968819; bh=TW11RH4a+EN4x+mZM4SOcko8dhOIwqkcGt1Dnpx8oYA=; h=Date:From:To:Cc:Subject:From; b=HVSNQOpLpJwIgiuS61jiO0pV6IbvtgVlvz/39c28XQefQoj1lHloubT8yHiQP4Yyf +uw8sNfuFdx5swECB8zWHXGocWhtH9h4+INLFCNoKX0IoQbyddCSg8jxDRPRLeWEz1 7YhsEiOJMV85YoYd8IMvEqfruDfmUwXt7pFF2zrgLtWikfWg9g/GyeVLZXJqQ2TOgu X/ZDeT+3BIkP1nakkpTLv2InLVHyHVT8zGhGM9WgnRrc5VxpmIaTMvuCxsgYFBbWvF bbIEk4GW77C0RQ5mNcwHAPO2THkc4uHRZeUWL1iVnO+vuBL1WpNzY9Sgd8ln45oHJa K1FrQ/WFqtGtQ== Date: Fri, 17 Jul 2020 16:53:36 +1000 From: Stephen Rothwell To: Vinod Koul , Kalle Valo , Wireless Cc: Linux Next Mailing List , Linux Kernel Mailing List , Ludovic Desroches , Ajay Singh , Vladimir Oltean , "David S. Miller" Subject: linux-next: manual merge of the dmaengine tree with the wireless-drivers-next and Linus' trees Message-ID: <20200717165336.312dcf09@canb.auug.org.au> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Hi all, 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 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 MAINTAINERS index 07d6eae16e77,9af8f81f726d..000000000000 --- a/MAINTAINERS