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.8 required=3.0 tests=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 B5307C43603 for ; Fri, 20 Dec 2019 02:45:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 58F3C2465E for ; Fri, 20 Dec 2019 02:45:44 +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="eYb1W3+T" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726986AbfLTCpn (ORCPT ); Thu, 19 Dec 2019 21:45:43 -0500 Received: from ozlabs.org ([203.11.71.1]:35815 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727006AbfLTCpn (ORCPT ); Thu, 19 Dec 2019 21:45:43 -0500 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 47fCm46mdBz9sRX; Fri, 20 Dec 2019 13:45:40 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1576809941; bh=S+Vd4CiK/V7OBYDe81f0w3P2BE6PmGpdcqG5olDC60g=; h=Date:From:To:Cc:Subject:From; b=eYb1W3+TxXCYAMdlVFCxzXuKiJNmCAubwdqOGmlQqiRXklbf0AcYDscC+acDETvwp PUnT3dNbkcsvAT9gUBHGiPEIdQj0YUGaER3IwLD7NHoMEioTrmQi1rMIgRo7vMJC5i bFFqp0aLrausu6wAz9twY1cz/n3oCLiv1yKvrtyyrxavQxGkfthte7njFbdplxQyFl Bri7VMprHED/oWP9l7Tnbtfjljorz1Vk9JwsAvzvo0NQJ109wYZ4azv1P7tvaYOHw0 a8ND0uNADmvyWGKfKzbs16yHeEIYRrTCNqjn2B7zUcd2cCyvAvwbAZIL48c5a5OIRA EbYY/aw2S2/WA== Date: Fri, 20 Dec 2019 13:45:39 +1100 From: Stephen Rothwell To: Greg KH , David Howells Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the driver-core tree with the keys tree Message-ID: <20191220134539.38872256@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/UccbYI=04d4e_ODkYncx9Bm"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/UccbYI=04d4e_ODkYncx9Bm Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the driver-core tree got a conflict in: include/linux/device.h between commit: 3a92c6e49c47 ("Add a general, global device notification watch list") from the (20191211 version of the) keys tree and commit: af628aae8640 ("device.h: move dev_printk()-like functions to dev_printk.h= ") from the driver-core 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. --=20 Cheers, Stephen Rothwell --Sig_/UccbYI=04d4e_ODkYncx9Bm Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl38NdMACgkQAVBC80lX 0Gx6TQgAlEhYTL2VvX27CZwaHsGJVKAye0F77x1fyrlDPMMloaiEZlQLaIS7ZsQP UIBCvxcW0dYErtoF2LZyeThN8/+Di8WP5JjQ3mn1G0HNK9XZus1ZGQTR+1VDECIP qhITA2wcJV/ppPF8SsiGZ6xddjx8nlCaJDCAwbMNyUkAIRtBGUgoIpUe88i7RI9q kntLtwQ2mN8T7SnC6JpDZRhIjRYv9/E/qQJHh69vjSA9qwpSIEm6QpvH/gSU1Gy5 VaTYby7dsEYR4kbto7e1xajKYV6+M0VfeWd4gMvo/s17SZURAunR7jEdq3j5FbL5 Z5CLoZ4WfhDUqGlQ/xISMzy3dxB3Fw== =py+0 -----END PGP SIGNATURE----- --Sig_/UccbYI=04d4e_ODkYncx9Bm--