Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp4611475ybg; Mon, 8 Jun 2020 12:12:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRVNcXT6FzF+pugm+SaHNKAjDP17NS2QHLLhdOSLQoRXOZ5kMBWSymMT5q3nD639JTpf2l X-Received: by 2002:a17:906:1dce:: with SMTP id v14mr21824589ejh.46.1591643559126; Mon, 08 Jun 2020 12:12:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591643559; cv=none; d=google.com; s=arc-20160816; b=1EKm0gMhapTsJOitlMhruOixZLWGryBxTVZPTwdktf2IRlClD0nVyEA40xQVyabn2r rAutwFeQJZcgMxUpqmximg9NvPaa69yw6HQ2uaIOgn42plBFurFDNQgqefsWsTkwvlLO Ev+kP9QC2RogM/gOdT0J9ouYfm6tLhVtFJKvowfe23iJHsJip+L4OWfK1N+vo+S2tQoL 0RDlaL8fDH9q164JiuIylhvsumA9leQQlvI3hSKS+zrG6qPpCD8zSw5pMX5whjtKbCL3 HbP8+9Xqi9da2b1i4346GQ7ESuSjyOLTtLxZBjEaEyEuejXyjyZR4m05rGENL8+zYH7q haRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=Ym4tU45MMnDn25Yhgd7+0Tq2VQSssyVJvFlY7FBum3s=; b=FdQayCF2lYGKssbEF9pqn1Nyf75jeDt34Rz47mjw7WjYC7FzH9ms3BdaGJDPhQi1dz ICQDc1e8pkwC5jT3f9bnmcyLnvQVGLy2SR7ZO7jGZysvK4pyIC2cEgNMTZhqPaLKHZHh hpel7D3pMYKWEC6+lCSQBU7rxBUumWTOQZLgRrYAB2J0PfdcUH3UEp20Yy4bteU3DKfS uSvFjcMzC7V9VihlxeuZlpSm+Ms2lj3V0hjPy5Tv6cojAvaGolUYk3cjGdDbqBxUCLNr eIXJwzy5MffEmDuVQVjugAt47IHtlFoomKiPKy18ZXgf6eeOFbCZF2mROsOPLgH2CW0O xGgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=google header.b=R63Bra+t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d14si9818158edp.573.2020.06.08.12.12.16; Mon, 08 Jun 2020 12:12:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=google header.b=R63Bra+t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726446AbgFHTKA (ORCPT + 99 others); Mon, 8 Jun 2020 15:10:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726203AbgFHTJ7 (ORCPT ); Mon, 8 Jun 2020 15:09:59 -0400 Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 175C6C08C5C2 for ; Mon, 8 Jun 2020 12:09:59 -0700 (PDT) Received: by mail-lj1-x242.google.com with SMTP id c17so21894999lji.11 for ; Mon, 08 Jun 2020 12:09:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Ym4tU45MMnDn25Yhgd7+0Tq2VQSssyVJvFlY7FBum3s=; b=R63Bra+tBgqvZPgopT1FJ8n2T+OgE8VA8m7mcDj+55e2Todzm9t2WJlHgbFo/Isqm6 Ld6soz/+MFK7Kk5DnXXHBSb8xgvSJEVBif0UvuZjrjGkqPH5vuuwwq7ihLUqfSsewrML aeYgDYnLPIX9JxlIgql5glnikrkgxcCJI5Pis= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Ym4tU45MMnDn25Yhgd7+0Tq2VQSssyVJvFlY7FBum3s=; b=Ti6y8dlxac1F7sLFqfqcLG6Q3t3WHPuuk9mwWpuoVeFIK8QQ93U+X3e4jkYbQXM2pg GoUK1QNyOEMVGGO2WdsPz/x7nscL91PJDJa9vFnlrn9dwJYmQC9ZqJUn4BfRX68rOw7s HLJGsz769n58i5JkwufZkMpvTaiT72zKelkP01Qm7drpp+otgSEwsj+Jfb4yT4wmRNod 7HHP31OmobwdvyRC3gXCYgLy8cGIHoB5KgBuw3D0NiwITLW5xMS0SRq6VrFBzgWPeas5 N0pOEu+fy7zKE9n4LKcG2YRRQfgUGq+GmVHkEO9l21kZYDFDRtUOyUZ8UUpB9mgP9Xqm NKZA== X-Gm-Message-State: AOAM533Jc5PReABo9GauI5cE9z+SflWY11syabKOQ8jmRMnTYVqeJIQj rQzmnGWTwtQc+P4tbDGvpUsmnS/5t34= X-Received: by 2002:a2e:8ed6:: with SMTP id e22mr10737763ljl.401.1591643397158; Mon, 08 Jun 2020 12:09:57 -0700 (PDT) Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com. [209.85.167.47]) by smtp.gmail.com with ESMTPSA id b25sm4554167lff.26.2020.06.08.12.09.55 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 08 Jun 2020 12:09:56 -0700 (PDT) Received: by mail-lf1-f47.google.com with SMTP id j12so10925775lfh.0 for ; Mon, 08 Jun 2020 12:09:55 -0700 (PDT) X-Received: by 2002:a19:6a0e:: with SMTP id u14mr13102855lfu.192.1591643395609; Mon, 08 Jun 2020 12:09:55 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Linus Torvalds Date: Mon, 8 Jun 2020 12:09:39 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] s390 patches for the 5.8 merge window To: Vasily Gorbik Cc: Heiko Carstens , Christian Borntraeger , Linux Kernel Mailing List , linux-s390 Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 8, 2020 at 8:35 AM Vasily Gorbik wrote: > > Please note 2 minor merge conflict resolutions below: There was a third because of the iommu tree I merged today. That one looked trivial too, but please double-check things anyway, Linus