Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp5850813ybc; Wed, 27 Nov 2019 10:24:14 -0800 (PST) X-Google-Smtp-Source: APXvYqyJo7qjpZB+CUZTmDBU+gHolDktvL7hQ9rQRD/DbjVYeq3uuDTaNFTxq5awk1OyVy2iO8ov X-Received: by 2002:aa7:c2c7:: with SMTP id m7mr33950592edp.295.1574879054884; Wed, 27 Nov 2019 10:24:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574879054; cv=none; d=google.com; s=arc-20160816; b=O1agtMspyMYVlJuLA2RNsVFKL06aNEZkQ/UUYCP1dUi3GMj8LKYpoFsWH4zZZog2ic SEiBVGNCrrmm1wjbQ0wVcWfzkFKF/6RINYAmsd0giPj4LTtjEM56J8TvgN83X/K4s+Ro 8KOdCkdb4gkuKTYthNWh/wFRRebGNKeAhdL39dAqacKGYj1RDFYI1zwYy7XKNiSEmFVT CZijDyZejRWYIM6w7w9SSINkkXb7LZJb+WvXWKPEjaInC/3+Em9NA20gLI/AmJzqfkbO gugDzkvABFQCb2sofmCmofgv4wEcuHHbJi8PuEwicr9ipCMLQm+ewdqeLxDjbKavb9Kn SKzQ== 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=cwpNndouEqIAQ7+k+dkJbISEfrceAc9l9U5/isaZ+uE=; b=ssDAXtJSEJeKNI136zJ+wbV7BMWt3C+2GR1TiAPiqTZBLxGw1o1+x4idDkwJQmG6vJ f2w774hIildfXx5AIjEcv1Xw7+Xqu/jbDlxUR0BaPzOc+YIhUh9wCL/Ng2Bv37AzaId8 iQF1RNQBcQcbAsVaiURqdNO0jfWlwH5zILDpqrsUtZmuE/HY4G2cz1iWQDZ+jqnAD5Cz IA+9UMDHJ9zJKESIE90OFIW6//epzodnmJApyTfGTsQVA29mTh8tHYrnuyhbk+d/Si/l cbDvswXR0xDvxNP2JIyvE2FQ6SMmLbXsyZtSPaAnHr6P3wt2ixa6Ey/40BvyktE7hsdN JRZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=google header.b=VCIoRanJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ci3si9846262ejb.37.2019.11.27.10.23.50; Wed, 27 Nov 2019 10:24:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=google header.b=VCIoRanJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727169AbfK0SUM (ORCPT + 99 others); Wed, 27 Nov 2019 13:20:12 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:37129 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727007AbfK0SUM (ORCPT ); Wed, 27 Nov 2019 13:20:12 -0500 Received: by mail-lj1-f195.google.com with SMTP id d5so25550385ljl.4 for ; Wed, 27 Nov 2019 10:20:11 -0800 (PST) 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=cwpNndouEqIAQ7+k+dkJbISEfrceAc9l9U5/isaZ+uE=; b=VCIoRanJ2BSoE96u/1A8Sh/MjKBNZOlFe6axmVbKRJpSN5et6ww6OxWHsYRv20kLos fDeRLhVXN66pcYfCZ8b95qLf2djCsxLD43qN2pdmpoie+a4poE/4ta1yzu0u4yU2zlQD Vl7A8lEJsjoPFz3Xr177Yku9/ocjKFVNLH4uI= 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=cwpNndouEqIAQ7+k+dkJbISEfrceAc9l9U5/isaZ+uE=; b=bIiffvQcrlwNugwLbqK3vXo5VqAnvz/X3f4LPZ+TjNhaJxHzgfSy/NYW8/8GdVZjPh UPYU8utMXs8cvo6DQ8ORFONkuW9+IhGSA26WHMODjett4hZkp5z8LZUAs3shlMxrrP9e g7fzUeJGjtrNr4Xjj26Feh6oagnyOre9KXmCBhA28ZNr1BsCILYZd5ADdBfqitx6P3AC 3SF6nuU0OpMhNbqsELNvBCfJl4/fzFCDsDmzX56v7Kxx2pBHqXuMsYdq9h9fQ5Y+HmeZ yF08uvxZlC9KsNtbiTuVRAFD5tA+5b37SUhmead1bQNGoSqnQzAsvTPivYhXNcII7Xgi Aitg== X-Gm-Message-State: APjAAAW+iB7CdgB8LZ1nDYki0OlW/3eQ+YxdYu8ZFkdWObgnQzUHeqNq nw50pXDdBjnbn+ZqEws5KABOoY9rLC0= X-Received: by 2002:a05:651c:38f:: with SMTP id e15mr31592678ljp.107.1574878809936; Wed, 27 Nov 2019 10:20:09 -0800 (PST) Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com. [209.85.208.180]) by smtp.gmail.com with ESMTPSA id r22sm7422446ljk.31.2019.11.27.10.20.08 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 27 Nov 2019 10:20:08 -0800 (PST) Received: by mail-lj1-f180.google.com with SMTP id e9so25518382ljp.13 for ; Wed, 27 Nov 2019 10:20:08 -0800 (PST) X-Received: by 2002:a2e:8809:: with SMTP id x9mr31883187ljh.82.1574878808221; Wed, 27 Nov 2019 10:20:08 -0800 (PST) MIME-Version: 1.0 References: <20191127002431.GA4861@ziepe.ca> In-Reply-To: <20191127002431.GA4861@ziepe.ca> From: Linus Torvalds Date: Wed, 27 Nov 2019 10:19:52 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] Please pull RDMA subsystem changes To: Jason Gunthorpe Cc: Doug Ledford , "linux-rdma@vger.kernel.org" , "linux-kernel@vger.kernel.org" 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 Tue, Nov 26, 2019 at 4:24 PM Jason Gunthorpe wrote: > > There is one conflict with v5.4, the hunk should be resolved in favor of > rdma.git Ok, so no need for the (now two!) xa_erase() calls to be the "xa_erase_irq()" one? Linus