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=-4.0 required=3.0 tests=BAYES_00,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 DD592C433B4 for ; Tue, 27 Apr 2021 06:25:03 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8397B610C9 for ; Tue, 27 Apr 2021 06:25:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8397B610C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JGqmxxP57RPJztPMW8EXcJFlZanQBkri8VYpNcGWOrc=; b=I3SFWtlZxEy10Z96rjguDQjKQ 6TxNUDVgsKuuf8XnbYjuzYXCVuHGY6Kx4Km85OQPUU4hjuifNVrl6GwTwZItwGuEsS50/MT3wBnqQ 2sj69yFTMz3uqMz3uiogAjXCBIBn1DRRAkBR0E5tY6rw8gV6n4ukoCdi8AudUMOa04fD3Rsq+iVqO ABSnAz0xezpOMyieDnUNP5fZPUlmr2N1TRefPj/49kTgvJlMsOXaaN2VR84gHWtMEsUEDVCoV1JMJ 8UI7rdwt/RwqNeodsExl/ALC8gXbLe/IehRog8wW94pvqyF8vDLwrVYoRzEh0x+gt2aAXhBlm+Ao2 noAG+UtbQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lbH6u-000qwq-0m; Tue, 27 Apr 2021 06:22:16 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbH6r-000qwd-Kp for linux-arm-kernel@desiato.infradead.org; Tue, 27 Apr 2021 06:22:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=ocvRPcOp16XcQwfQiJGng1SabswUmCSepivN5Gcm3Yc=; b=fhLCpxcnJjdWa23OqooGbFBiaM gt8A3ugVONkslVRQIxQh+EbrEyMrZlGnN7WR6cnwNNGodj1qqPExuH+iPZJKBnCHvYUZtfoLBeNB9 ReYSYbiDVZ1qKDU+XkgxkAMmDInnkPTWCkT+nMuKnGCOCSzQEYNFNhPDFjdOiEtfQ36t2okdhPx2D 1D46/ilmr76baFtUbpQfIy1BFvfRkVAdpxBfAmDUizQpa4vVP7C9s3ZGOzAYTd32WI+8x86LfqqJO ZGFpDEbIOpeNeo7Z9mYCZdpTe5E9KJrAzXTW62nP7mkRorvGoIuddX2vsQhU+WZ5XblStD3mQNF/c pOdffZqQ==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbH6p-00GTKN-3X for linux-arm-kernel@lists.infradead.org; Tue, 27 Apr 2021 06:22:12 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0536A610FB; Tue, 27 Apr 2021 06:22:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619504530; bh=gyRZOb++YF8JYaY69vWwYHNhGdItpAOrKimCZDl4mes=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=qZdLuYmn9kiKr7NHOGuUopAOCVVH3RCLBD08HrgyPV6fYI2eERpGcheCgXGOnZUJq B0iUJDofrajN2dY9TlIfn+BQtd7sNqOaCA5ZB0dyY1hZe/mwdy3zToPnJF6qlUwt0S YrFecd+c+P9tf0qvzfawuyyLxAVcUoMNG8obDn+E= Date: Tue, 27 Apr 2021 08:22:04 +0200 From: Greg KH To: Linus Torvalds Cc: Stephen Rothwell , Andrew Morton , Stephen Rothwell , devel@linuxdriverproject.org, Linux Kernel Mailing List , linux-staging@lists.linux.dev, Mark Brown , Sudeep Holla , Olof Johansson , Arnd Bergmann , ARM Subject: Re: [GIT PULL] Staging/IIO driver updates for 5.13-rc1 Message-ID: References: <20210427002648.22459fa7@elm.ozlabs.ibm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210426_232211_198725_7383480C X-CRM114-Status: GOOD ( 16.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Apr 26, 2021 at 11:18:49AM -0700, Linus Torvalds wrote: > On Mon, Apr 26, 2021 at 8:11 AM Greg KH wrote: > > > > Yeah, merge issues with other trees are hard to resolve in the single > > tree here, not much I can just yet, have to wait for them to hit Linus's > > tree. > > It's generally a good idea to mention these things if you know about > them, just in case the other tree had come in in the meantime and I > had merged it first. > > That didn't happen this time, and I do generally catch these things > anyway as long as they at least trigger problems for my usual x86-64 > allmodconfig builds (but not everything does trigger that). Sorry, will mention it next time when I know it's going to happen with another tree like this. Thanks for pulling, greg k-h _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel