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=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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 B7659C43218 for ; Tue, 11 Jun 2019 00:37:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88238206BA for ; Tue, 11 Jun 2019 00:37:54 +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="hzZ44tv8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728651AbfFKAhy (ORCPT ); Mon, 10 Jun 2019 20:37:54 -0400 Received: from ozlabs.org ([203.11.71.1]:47859 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728645AbfFKAhx (ORCPT ); Mon, 10 Jun 2019 20:37:53 -0400 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 45NB1B5yz4z9s6w; Tue, 11 Jun 2019 10:37:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1560213471; bh=LApRJ/z+bE9As444VerdrsONXsMGcN0MCgEVQHgZHgA=; h=Date:From:To:Cc:Subject:From; b=hzZ44tv8l7xbSx+urUhZgOTIXtzGMwdZW9ymKYNm73ug1afLKnj9E3IipGkNOOs9o CpUpwhjD8C32rJSjc/da0SOn0M/RjkzF4R1J1dwYTtfhXga1gYoxc4coaeBxmmhIDi qFKG6tQJLeBQRHYvnkb0/XjfVuw70yz8jy+Hp0eUwVs1PVVc2VJYfC1El5PJm1a14O gc2GU4CXKwhBMRDUdek/T3ZGeXyJXaSIDPTl4ohx903QIE23yoUuYLbX1qC0EMC6cN asfHfNw03p6snqT64GbHjFxrvjNu3RXq19OfbgkmS8wJnYBeQNkXKfUcU4URMBSMCb i82jKz1SoUaFA== Date: Tue, 11 Jun 2019 10:37:49 +1000 From: Stephen Rothwell To: Bartlomiej Zolnierkiewicz Cc: Linux Next Mailing List , Linux Kernel Mailing List , Thomas Gleixner , Greg Kroah-Hartman , Fabio Estevam Subject: linux-next: manual merge of the fbdev tree with Linus' tree Message-ID: <20190611103749.01b1f922@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/Z4fE.w_vLjwIZ6T2Vb52IiE"; protocol="application/pgp-signature" Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/Z4fE.w_vLjwIZ6T2Vb52IiE Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the fbdev tree got a conflict in: drivers/video/fbdev/mxsfb.c between commit: c942fddf8793 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - = rule 157") from Linus' tree and commit: f225f1393f03 ("video: fbdev: mxsfb: Remove driver") from the fbdev 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 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. --=20 Cheers, Stephen Rothwell --Sig_/Z4fE.w_vLjwIZ6T2Vb52IiE Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlz+990ACgkQAVBC80lX 0Gyadgf9HgVSEMSbwgwG6QGeWoIEGU1Vjkav8JI4k4xrVlrgXoUce+w5rpXYPXGK m9AXJ3pgqJwcyYoUWTAHeUhb8yK8LVC6dK4UcHUFED0v/SAdEZMf2ydElqB+uUkA 8G9id8tyNyYVkAbVeJ77NhaRMkcVpPp296x4XvMATQ6SFz0Uwc8QCL5McjWaFagJ y2G8kpCwi0dPiRj7sJ0RdcamcDaQh6hNNZVaI9kWB0Z6iZ+nHty0CfRJ58A7Tw4P umKx6heptIw6jOHqrDQoc7fs31FdfJRG2dbk2HcmreHF4BXZFKQ4ILJ5NWVKKrBg bOntckzVRJyac2haE2KVLwqVf3PCYg== =JfG9 -----END PGP SIGNATURE----- --Sig_/Z4fE.w_vLjwIZ6T2Vb52IiE--