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=-4.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 0B403C43461 for ; Wed, 2 Sep 2020 03:11:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0EF62068F for ; Wed, 2 Sep 2020 03:11:24 +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="Ms9sZ7/h" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726355AbgIBDLX (ORCPT ); Tue, 1 Sep 2020 23:11:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726140AbgIBDLW (ORCPT ); Tue, 1 Sep 2020 23:11:22 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 952B0C061244; Tue, 1 Sep 2020 20:11:21 -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 4Bh8915lcfz9sV7; Wed, 2 Sep 2020 13:11:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1599016278; bh=fMqQBM/WSVxCFrgE4f9I7KOjhhp1KYxGJKwaQlaQgxg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Ms9sZ7/h81j0dqSoC4IWiudG/R69XosP+PQZtVPtFo6dn50GXhQi0vrAP7F+yu1Og spqjdKdxGXaw5hsFlze9fA8PuiB5se7H80ROXJIGxYpTfHkQIq7XlHVY+HdOFUgZk7 ggkD7q3N9zsMme+vPwC+DXJOijBkPGZuq+pOwQgws5JU3t394B+Cycr/G+hYodgb71 usX/i9vhqcJCI+I5mImq6ivT/20elSyTzf39bYxtERKE2//FG0hoD4g4F8OLo83OjT 07zqSlZWPQogXsuTbtIPKdCGr/PPYIJ4GYxpyHvs7LTyh8RGE1itvIzmqEeOBm2JH2 FPBK0qmvI6dCg== Date: Wed, 2 Sep 2020 13:11:16 +1000 From: Stephen Rothwell To: Dave Airlie Cc: Daniel Vetter , Intel Graphics , DRI , Linux Next Mailing List , Linux Kernel Mailing List , "Gustavo A. R. Silva" , Sam Ravnborg Subject: Re: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20200902131116.053cefe5@canb.auug.org.au> In-Reply-To: <20200826100113.6126afad@canb.auug.org.au> References: <20200826100113.6126afad@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/EqPDh0qhb+x1GhuW/Hz6reS"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/EqPDh0qhb+x1GhuW/Hz6reS Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Wed, 26 Aug 2020 10:01:13 +1000 Stephen Rothwell = wrote: > > Hi all, >=20 > Today's linux-next merge of the drm-misc tree got conflicts in: >=20 > drivers/video/fbdev/arcfb.c > drivers/video/fbdev/atmel_lcdfb.c > drivers/video/fbdev/savage/savagefb_driver.c >=20 > between commit: >=20 > df561f6688fe ("treewide: Use fallthrough pseudo-keyword") >=20 > from Linus' tree and commit: >=20 > ad04fae0de07 ("fbdev: Use fallthrough pseudo-keyword") >=20 > from the drm-misc tree. >=20 > I fixed it up (they are much the same, I just used the version from Linus' > tree) 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. These conflicts now appear in the merge between the drm tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/EqPDh0qhb+x1GhuW/Hz6reS Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl9PDVQACgkQAVBC80lX 0GxfrQgAiYy2Uvk9WIuGe6Uh3xcidT6fayH+7qRRtkb6lJwiiHpIUfhE+GP9daT1 OGAQJluwvmxI+PnKrZFNdiWSeiiMhsQaDdjPsDfmIu1lOjw08iKv+Nt0JLQN7pV0 vNm4iLLEPaA3loIK7wEltXdO+BblFJqn6CLKx9xM8EQsQqblyENeaBaedSwBcihz dmhHANdpk2nkekqy0Y/tciHCBg3W0+mEHKRck0sHbCqX0Hf1GqRyNmX4fY/acNCa xitQIeiLdi1brjG3AUylzaEhkICsJbKZIK6JJwwxwjcj7V+Hsjju9qfhDA60vAo7 x8amUFStU3kPS8fbZv3nnEDH0TKgcA== =a3CS -----END PGP SIGNATURE----- --Sig_/EqPDh0qhb+x1GhuW/Hz6reS--