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=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 9A4F0C18E5B for ; Tue, 10 Mar 2020 09:04:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64E102465A for ; Tue, 10 Mar 2020 09:04:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="XXsXuouY"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="epIKnBDy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726283AbgCJJE0 (ORCPT ); Tue, 10 Mar 2020 05:04:26 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:56179 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726195AbgCJJE0 (ORCPT ); Tue, 10 Mar 2020 05:04:26 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 1F27E21EBC; Tue, 10 Mar 2020 05:04:25 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 10 Mar 2020 05:04:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=uatK4ds+rmul1mRriGcrKyF/spn Qea/id1rAEINGl3w=; b=XXsXuouY7BuRN3rXbfvoUn57graVW/NVR5a8/96Mvsi hvLOkUQYjK66xoqjljmfXr08gzhlbfiGX4uW9yr1lIgMggYcxrzjywqv7vu9l+hi BlG/qDUDIEr26w6MeepzWyWQBSTglWR75hDfg4FuCE5a/M75yNqt3Q6mf3LE+AKo 0AeUW+FgHyzBkXhA2dtFRsJ3LKlERchyl3ESyro+dvgySt8UC61g9ULQM9ygbY2H C885gchkLJlHb3AabL2bNjGEufdWRvHuoQr23fwZHa+zh+WXXtR/SJJkGEvSLtJW W7vxWYvOGhCh3ZvMltEPNIecVnSI5fXyPgn4ImCe+Xw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=uatK4d s+rmul1mRriGcrKyF/spnQea/id1rAEINGl3w=; b=epIKnBDy3QLd/vkX2YNGB+ 58BK51/dq1HOwaMyadHz5C0aQpUQQk86MBCXP8sOLHk5eSq6zAh9anxZ590Hpad7 Bf267Ue8QHvT7ODd2B/oGn4NrRkX4h56W1cEEGawNtB1y8FxcfhGiaWApDyV4m5s iBhRb4CdUaKYj5/HwerD3D+yv0J/lE8tzt2O/klofxKiVW4NDCOAF6Xul6lQVTQP 8DZHSFaewgS+Za8tjVHIXHYWcahhFHCy3WcJ4vhXshKyxW2ynCrpPpzzR4Dcc/kD 5QjTYzet678vPilm4CV4x6lbCXefEQJPdx9T/rCNM3k2zNHYkyr3PnDPZmK51Ucw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrudduledguddvjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecukfhppeekfedrkeeirdekledrud dtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehg rhgvgheskhhrohgrhhdrtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 3B4EA3280069; Tue, 10 Mar 2020 05:04:24 -0400 (EDT) Date: Tue, 10 Mar 2020 10:04:22 +0100 From: Greg KH To: Stephen Rothwell Cc: Linux Next Mailing List , Linux Kernel Mailing List , Jiri Slaby Subject: Re: linux-next: manual merge of the tty tree with Linus' tree Message-ID: <20200310090422.GB2445065@kroah.com> References: <20200310144013.6df85b46@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200310144013.6df85b46@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 10, 2020 at 02:40:13PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tty tree got a conflict in: > > drivers/tty/vt/selection.c > > between commits: > > 4b70dd57a15d ("vt: selection, push console lock down") > e8c75a30a23c ("vt: selection, push sel_lock up") > > from Linus' tree and commits: > > 9256d09f1da1 ("vt: selection, create struct from console selection globals") > bc80932cc25a ("vt: selection, indent switch-case properly") > > from the tty tree. > > I fixed it up (I think - 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. Thank you for this, I hadn't gotten to it yet. Your merge looks the same as mine, and I've pushed out the merge resolution in my tree. Jiri, can you double-check to verify that the merge is correct in my tree? thanks, greg k-h