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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 A0557C433E0 for ; Fri, 29 May 2020 21:18:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D49A2071A for ; Fri, 29 May 2020 21:18:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590787125; bh=AngJgtK5EUPd1+aDY/U4ZWwkNRFFcBeTzGQkAUKr8aA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=XCC7uQi05qlAPVWPrXLS9QG/oDJ+46ngqQKU52GGbLh+zLmO6vQ5VFJnxoj29zQ30 7aud+xz4zudJmsB/qAKMSr8DiNbDVGCChLPS5VPUwugiJbczK0S0pLWCfLWr+ClWhj IF5A7Dvw9wdmBXJiYxaJM7oRJDUe+OX6tBG+msro= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728237AbgE2VSp (ORCPT ); Fri, 29 May 2020 17:18:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:37650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727851AbgE2VSo (ORCPT ); Fri, 29 May 2020 17:18:44 -0400 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 09BCB206A4; Fri, 29 May 2020 21:18:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590787124; bh=AngJgtK5EUPd1+aDY/U4ZWwkNRFFcBeTzGQkAUKr8aA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=GvBC74cWsX4gVV98hIarLZzzbwAL8bpIbEZg7Rh90f6ii7NDRDQJWR3G3gVcMoGlQ 9SAGp/N6rwXHCaVlIWGA7ZKP9HRnG/lHNR3PhGOczdlI8U3EVEYkdys+wrN1yaUEmr 7epvuQGp3u+T+qkSwahTVzsVlu3cgkE+pf2uBs6A= Date: Fri, 29 May 2020 14:18:43 -0700 From: Andrew Morton To: Palmer Dabbelt Cc: Stephen Rothwell , Paul Walmsley , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, zong.li@sifive.com, rppt@linux.ibm.com Subject: Re: linux-next: manual merge of the akpm-current tree with the rsic-v tree Message-Id: <20200529141843.5bf4c1b34d896af3a8ccf059@linux-foundation.org> In-Reply-To: References: <20200528192211.2449bd4f@canb.auug.org.au> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 28 May 2020 12:19:35 -0700 (PDT) Palmer Dabbelt wrote: > On Thu, 28 May 2020 02:22:11 PDT (-0700), Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the akpm-current tree got a conflict in: > > > > arch/riscv/Kconfig > > > > between commit: > > > > b151fefd23b7 ("riscv: sort select statements alphanumerically") > > Andrew: Maybe it's easier if just drop the patch? It comes from a script, so I > can just resurrect it when things are less busy. > That's OK - whoever merges second will have some trivial fixing to do, not a big deal.