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=-1.1 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 05DF4C5B578 for ; Mon, 1 Jul 2019 07:15:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CEAD920652 for ; Mon, 1 Jul 2019 07:15:30 +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="iOnubJZ0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727851AbfGAHP3 (ORCPT ); Mon, 1 Jul 2019 03:15:29 -0400 Received: from ozlabs.org ([203.11.71.1]:60319 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727173AbfGAHP2 (ORCPT ); Mon, 1 Jul 2019 03:15:28 -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 45cdth4Rf3z9s3Z; Mon, 1 Jul 2019 17:15:24 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1561965326; bh=NQCoMmp1fRfhn8eCaGqip33lfSACdYmYe4GpESB/Ko4=; h=Date:From:To:Cc:Subject:From; b=iOnubJZ0VEAkAq6nY1PaIw5UQd8sC+zpy0TBmfC8VNL6iOTuXYJgy+GIy8pArqr72 Py0QiF/98+5bd3EdOSiYSQF9yrEFCqhQK0A7mwyqSXOJEK2fwjnU4YLzUDwy/mhnt8 GUAhhD0Jtt0Hk3DV9xly0MYo8CDEmjD149IG5ruOUY+Tiq8P6FaWV/i3Ck8Ottv+hL B9LdujG2gdloD0E6wT0AU0jJOmHqnKufOVnqTVyKrcnLiL0h/lZO9qp8X4P27xdb6v X0OUAK/OQVN9lqumYB+7px4SB98fOXFLbfX7OXn1VStKKbX04XQmabvcC73wj1e2pG f7yNwgdbbYKaw== Date: Mon, 1 Jul 2019 17:15:24 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Guenter Roeck Cc: Linux Next Mailing List , Linux Kernel Mailing List , Fabian Schindlatz , Len Brown Subject: linux-next: manual merge of the tip tree with the hwmon-staging tree Message-ID: <20190701171524.774dfc75@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/HrNCJG3JCzkTk8y_hkyymzc"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/HrNCJG3JCzkTk8y_hkyymzc Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/hwmon/coretemp.c between commit: 601fdf7e6635 ("hwmon: Correct struct allocation style") from the hwmon-staging tree and commit: 835896a59b95 ("hwmon/coretemp: Cosmetic: Rename internal variables to zon= es from packages") from the tip tree. I fixed it up (the comment fixed in the latter was also fixed in the former) 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_/HrNCJG3JCzkTk8y_hkyymzc Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0ZswwACgkQAVBC80lX 0GwZQAf/f5UwVhk2Yx3oPfS1elxVbRN00idMMvrACIO7LTaKDcaNRHE0UVWtRVzL OmSo8yXqMxAB1G3DG1oCXQ3pSKUGYBEuKGfP3XmS61IRl/tFw8vbcjArWuXesHbM a3t1JJ26DoD+/x8tY/TavraLvOmXfQp5M+Ev5b2zIsrpwXlXr9FEIxYl1f266yq4 Zhu61/5EZvjjgt6lYVWWTUDih9zU6uZefxrtPm83b8zS9AtYfK0rBsmn2kY5awOb j1vOfMNK4aGz4GY7wTEiBUh0Ju1VnSjvSDm8vUwIvHNFevO1n7ZU2XEgYNjxvhe9 8rmu3Lv2X4byUCwj9esQk5sBKsM6pA== =dxoz -----END PGP SIGNATURE----- --Sig_/HrNCJG3JCzkTk8y_hkyymzc--