From patchwork Thu Dec 3 00:51:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11947381 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.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 72BACC64E7C for ; Thu, 3 Dec 2020 00:53:25 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E3F6B221F7 for ; Thu, 3 Dec 2020 00:53:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E3F6B221F7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=EINCU21UeKbTwnev2UzT/QNVhOYwNFv+kZclfouCusQ=; b=mSw ggxcHG2zeHoYW7cQmZSMKgsK7MWJS9OSnq/fTsS2S67fHqU8h1UaHa7dmHQRzp3PXtkmIdtIK1QZU 4hpAShT4ID3O7Wix2/wpuVwLmuIWjVdIr3mss/8ukbmIHyfalQOtDA8vzUkhlZWFgsypqJ138oVK/ f67fjZdv5j1US4UNvECuTPsfTz3rMIe/QzneQdPk8rTLb9oTpvqhmoZv5LisvcJtkb/tqPlOhqJhV VMRqVrvWDox2Pdhdreuhl4na6jNTP2B1LZZWUuPtLdUQjnHDlupFUffpCma23kzYXeSJMep+Tu2Jh GqzIKj70pnH2D70gQcKD7hVRiob3igA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkcqg-0001cD-2J; Thu, 03 Dec 2020 00:51:54 +0000 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2] helo=ozlabs.org) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkcqd-0001ae-Td for linux-arm-kernel@lists.infradead.org; Thu, 03 Dec 2020 00:51:53 +0000 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 4CmcjR4bQtz9sT5; Thu, 3 Dec 2020 11:51:39 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1606956701; bh=fWF5uj3a4ILlBULHxMHRrMJZJWYp+rRV3bFYXjTz8mQ=; h=Date:From:To:Cc:Subject:From; b=dBifTR1P1tdC3ua+smIYimj+WhC6u0YpSaYKBBBbDG0PNUAdEdtp/y/c0hGsOPLeF g59YFzQcZYLiCFGH3/Jm7QhzRJ8asFdvNxf3/0t9pn+9+6ESm60WPtW6RcwCR+nMr7 ZaCD97h+fniCPf/+ck1/IAEepewGBtY12d9y9Mhe9K52ONw53L6QnKWRCCIlwmU/TS 4Q6/Lr+o6Lkp7e3pKhE54V47NyeqUQZw13vVTJB/1u8Cj5aenaSO7FnEhITy6+7NQL kXByu+IU6Gz2mzzHsxqWzJdEZWmOJjHWH+TTRzrA+EB4TlQjn0fUF0eNRcFKH2Vqgd CWNB4epV1g+Zg== Date: Thu, 3 Dec 2020 11:51:37 +1100 From: Stephen Rothwell To: Mauro Carvalho Chehab , Jason Cooper , Andrew Lunn , Gregory Clement , ARM Subject: linux-next: manual merge of the v4l-dvb tree with the mvebu tree Message-ID: <20201203115137.6620f27a@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201202_195152_366058_9F0E59A8 X-CRM114-Status: GOOD ( 16.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mauro Carvalho Chehab , Luka Kovacic , Linux Next Mailing List , Linux Kernel Mailing List , Sakari Ailus Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the v4l-dvb tree got a conflict in: MAINTAINERS between commit: 8c4e256e3d42 ("MAINTAINERS: Add an entry for MikroTik CRS3xx 98DX3236 boards") from the mvebu tree and commit: b24cc2a18c50 ("media: smiapp: Rename as "ccs"") from the v4l-dvb 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 90acea633c4e,02437abc94c9..000000000000 --- a/MAINTAINERS