Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   "Hawkins, Nick" <nick.hawkins@hpe.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
        ARM <linux-arm-kernel@lists.infradead.org>
CC:     Geert Uytterhoeven <geert@linux-m68k.org>,
        Laurent Vivier <laurent@vivier.eu>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: RE: linux-next: manual merge of the arm-soc tree with Linus' tree
Thread-Topic: linux-next: manual merge of the arm-soc tree with Linus' tree
Thread-Index: AQHYcWJIIPsLGQoQ6ky3ZRDOVp+Oka0y1/FA
Date:   Fri, 27 May 2022 15:38:56 +0000
Message-ID: <DM4PR84MB19271EE54D445DD8F1DB047988D89@DM4PR84MB1927.NAMPRD84.PROD.OUTLOOK.COM>
References: <20220527103916.52768f74@canb.auug.org.au>
In-Reply-To: <20220527103916.52768f74@canb.auug.org.au>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?ZCtYOy3J71WZSHQmV6V7/lluCFdTWJcEBO30xD/u68o6Hu9mSKAi7OZ1bwct?=
 =?us-ascii?Q?6Ur64VWAUSahNMDGXOpmLMExqYxw4R1PLFQj4oiytzMtU7wli8JukYQ53pj1?=
 =?us-ascii?Q?C3zlPNI/qQdCUqxiRrNRuMyFFg7Xs80E1WdRmeUYMHCstyurA3JOBmmaiszf?=
 =?us-ascii?Q?c4/Z4LbxqFOtOzGbsMovjBLp2hIwoEb3baMz47uNbE+FOYpSarf5QStD4Kik?=
 =?us-ascii?Q?bJZgVoABKcVVJIXa9cJPElzh3lpeAaDvO/JHOe8Lz+x+mvARvG/VF+zgGKqJ?=
 =?us-ascii?Q?SuPrvO5Q4LNqXZemENQg0640Supwoa7WH1odW2SYOeby0P+R+skBGWQEj/IM?=
 =?us-ascii?Q?qG57bdT9s0Uv902GLzXpdoNGM0EnecsWhKUwcBMBD8vZOSvd6vL4O4aIVV5D?=
 =?us-ascii?Q?0fpMA3/znlg//4twFAGcCzeXerl1Dr9OeA/zddVYibCbIAB6G5+vgaEaahYK?=
 =?us-ascii?Q?mN1/40PIMku/QjULmiPq5SABj+Wh446eOqM/2tvNEldBWvTZk1DYfAMNTQ0J?=
 =?us-ascii?Q?N9wIQTsdShkdmnRAJwrOJeS0AoZwnwCV93v8u3UXEH504mJ2zXy3J4l5m7BF?=
 =?us-ascii?Q?4CFcmjjzF91V27aDvVkM2cSTMCmC/OWhtjtHGYvEyu+N1mmfL1ig2JYj6SEp?=
 =?us-ascii?Q?i+3V8KqFWIc2bMjgwjle9WLeI8U5gq50ga28NpTaOPKD5wKUrlcYoC8HpgT+?=
 =?us-ascii?Q?my5fEc4V/hEXMRyfC8DvUSwgJAgKNDfztmRxsnoP3bBC9uI+GicQJwRfpfWr?=
 =?us-ascii?Q?3249qkqGz+WBPXfMmO1YHAVt1YPxEuMQgsWjiOm8RcAGVZocOhOi+xBteKTM?=
 =?us-ascii?Q?9DrIUAPBGC9Y5JcPAcOO0LdYL+1ZbMH/jOyZm5CE1pwhvV2FBa8/ng69ans5?=
 =?us-ascii?Q?qoXrHVM9pY49H08vSdElDjHrUCJHMuqLdvAb9xKOmXJn4mtFE7C1zNVJlnpu?=
 =?us-ascii?Q?HDtxtD2zi9ffbQIPXsbsGCl9RyZW+svj5yvNMkes2AFrSi/RvQZ5fDaVGNDl?=
 =?us-ascii?Q?mWBEie6xd7ax96mgvyYVASTVni6kwBWiaXYQZMXWZMFc+l3ZpjGDRsEL6JV8?=
 =?us-ascii?Q?jYtEQgwovtG30mz2xyxTnqRZxDPXhWMDdvTxJd4I3nFrXq5Nd0xOyd+A2ht+?=
 =?us-ascii?Q?ZiwejQgDAPHTtE15JgF5wDK9Xf90H9lJlBogjeKiixGWTxbN2Z0yXaIzTqih?=
 =?us-ascii?Q?YYix9wjPznq0zNexuXirDct+/T/xmLyIZLXaKtN3QeJFKbyHRFvv1EgvDha7?=
 =?us-ascii?Q?+BC2W2aSC9AFt0iR7e0RODjsyRTt5InT+umt5zhGyWikmNREbXtSHP388p6y?=
 =?us-ascii?Q?+YhKS8tAFZbXpheW9Klt+xSsjJH3+uOldwFBOmuGwm7341b9ge8k68Z8HCRg?=
 =?us-ascii?Q?aa1HAmIFiyNUAtqrzHLIkdTkWHdgej0RLWnt3pn1+bh1CfkYWwJfSCw3O5DQ?=
 =?us-ascii?Q?artcgBFrukRQVcCbfcxsHi5ICp0K/mjyOxvOrAVwsNnvI2kl+jDZAa7NjJka?=
 =?us-ascii?Q?KYUMbseAjf1PmxHaEnaLTewKIR3OcrB58kuvWAVzZLstfVG+OFWwXZDG1lzb?=
 =?us-ascii?Q?2TIgsF933I+baHFlRVpf2kfSERArcWFyTG65Uo7/ViixkzN1UWbN3w0JD3Ov?=
 =?us-ascii?Q?syTxbPucgnomH5PV6cm3gIYG98CJJCIV8LnQ1fpXtu7rnV/EvSD2TwHKOc3Y?=
 =?us-ascii?Q?q5rUJqj/oTJmu5VJZiD0UtTdGFSOA1P6B5ca4ANQvu88GYVGJMmxTRqpeHGQ?=
 =?us-ascii?Q?Zq9L6LRW8g=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: DM4PR84MB1927.NAMPRD84.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-Network-Message-Id: 977fcc2a-8504-49d6-9735-08da3ff702c1
X-MS-Exchange-CrossTenant-originalarrivaltime: 27 May 2022 15:38:56.1903
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 105b2061-b669-4b31-92ac-24d304d195dc
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: qdx39M4wuBhZS/aFnwUQxsqFVBgDEP51U6SYIk6NoezrbSgD2+9/E9DWLhPn6tAVsH/N3EcWollWdf3eR6IoEQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR84MB1679
X-OriginatorOrg: hpe.com
X-Proofpoint-ORIG-GUID: CX__DvTwi9jeA7YZCtGbWAE1Qgm_GaV8
X-Proofpoint-GUID: CX__DvTwi9jeA7YZCtGbWAE1Qgm_GaV8
X-HPE-SCL: -1
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.486,FMLib:17.11.64.514
 definitions=2022-05-27_04,2022-05-27_01,2022-02-23_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 spamscore=0
 phishscore=0 impostorscore=0 bulkscore=0 priorityscore=1501 mlxscore=0
 mlxlogscore=999 malwarescore=0 adultscore=0 suspectscore=0
 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2204290000 definitions=main-2205270075
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> Today's linux-next merge of the arm-soc tree got a conflict in:

>   drivers/clocksource/Makefile

> between commit:

>   c92e7ef16400 ("clocksource/drivers: Add a goldfish-timer clocksource")

> from Linus' tree and commit:

>   5184f4bf151b ("clocksource/drivers/timer-gxp: Add HPE GXP Timer")

> from the arm-soc 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 sho=
uld be mentioned to your upstream maintainer when your tree is submitted fo=
r merging.  You may also want to consider cooperating with the maintainer o=
f the conflicting tree to minimise any particularly complex conflicts.

Hi Stephen,

Thank you for resolving the merge issue. I am relatively new to this proces=
s.. Can you provide a link to where you were notified of the merge conflict=
?

-Nick Hawkins