Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4964377ybl; Wed, 22 Jan 2020 07:52:56 -0800 (PST) X-Google-Smtp-Source: APXvYqwgskcXAMYLp5lMTliFGzdORwypEvTqE2MD+bmLGHZrzMjbn6vJmkLI97bZXTeh+Z0mu4hq X-Received: by 2002:a54:401a:: with SMTP id x26mr7028968oie.101.1579708376217; Wed, 22 Jan 2020 07:52:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579708376; cv=none; d=google.com; s=arc-20160816; b=Z8v7gv8tvLfbyn9g6YR5BUT5lWRrmkpl+Odf1FYS8Jujl3Kv+5sOmvPk310HQXG/sq 8JZR/z3VLKyE+zeMDCiH1HYRNJAYnwF3xDnmu2pwyAGw1wyRgHlJnOHaa0oKDjp1nTps ZTCB/Ele/mzKQqZHepq3p/Z9q6Cbt43QqA8G5BX6SNFEIaNXXLGIKeOa6mw7Rn1HL5lH fhZf837imjqC+p7IubUyX1kWNqsyY0MqA3zugUrPdjTcnzzCoI7IvyAQF96j3qA9BCyh ojx48OzOVlDQfsHLk8xL+x6VQOVYMwjgDIUoGPPSM/o9n2U5erKMaByhBhpF1AVpfPX1 ikjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:mime-version:user-agent:date:message-id:subject :from:cc:to:dkim-signature; bh=TQtYIVnmBZTGSPMBAl2QZf/eZ6kMW1F4eBDZ4mB7h6c=; b=yg+x3OAAB5uSUXFihg4XZS5CrnTO3By4hrrtCiDfottagp3WuTgaGNtsvGDXAvk/D7 I8YjQWVd/aTmSeNNbI9bgS2rr7Juabfok5JTwbzWNm8qnXWqSAPpHQkN2YlXs8GJVH/v Byycd9kvrYtuZQbnRHlse/a3fj4nxQDHtTsVu1lqT6dSBwqX2KcQPS3+ND6oFIayhMSo lXBnqYdyZhSX04RT6qeePO98LIE+6E1TGCCZRtKvUYrXrRCabVnkPt9Du6uotbZqgTZq h0snd4WOFf3XfRkZgp5a3PUYNT6cETaMI/Lu7URGX/zwEyKdsY8eYlJayWWMFQ3V1QLu LcoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20150623.gappssmtp.com header.s=20150623 header.b=smcmK0GK; 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 x20si24092793otq.222.2020.01.22.07.52.43; Wed, 22 Jan 2020 07:52:56 -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=@kernel-dk.20150623.gappssmtp.com header.s=20150623 header.b=smcmK0GK; 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 S1726584AbgAVPvf (ORCPT + 99 others); Wed, 22 Jan 2020 10:51:35 -0500 Received: from mail-io1-f66.google.com ([209.85.166.66]:41130 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726205AbgAVPve (ORCPT ); Wed, 22 Jan 2020 10:51:34 -0500 Received: by mail-io1-f66.google.com with SMTP id m25so7080469ioo.8 for ; Wed, 22 Jan 2020 07:51:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=TQtYIVnmBZTGSPMBAl2QZf/eZ6kMW1F4eBDZ4mB7h6c=; b=smcmK0GKN1dQqQgLnBLLzgFICWzT8tPktwwZZh7+jPrIdNJqJF7j4lW7zwkNQsOuhO clz/t+48YeHACEJutxBF2IZaExTXRfxxWfAEmw957NVm2sIM1RX+g104hmFKEldVMKJn i6y05FaAl2RxRpm7nZCEFJNlGONY0/oOpqDmKogbe58MH4BovaKhNAbjzI0hU3UnKWSL tz1dAIc97KYbJZeD9kq9lNdqCVihEk5JZ8Fm+sdhrvRegIoYQ80uGXeEhhy1jlbtNAR4 mwjNDBMCvsy+cby0PQzMcvqSt+f7L/gKHo9HJVm1cpm061eDKC33R6qH31xEk7/wLA+H 3ghg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=TQtYIVnmBZTGSPMBAl2QZf/eZ6kMW1F4eBDZ4mB7h6c=; b=CXScGclwtrEoEv4TEBcGcNKjHFXzZg3F4/fYF4PwyRas/WfNXS4oY2FT84OphrV2h4 VI5UAXmxSt2PJJTgoVqf3DneUgL30Po3ltiWKHE14oumE2C62x0ZnZ7plPFdkATzTvW5 Ia9PMR8CO67cRBuhQe5dM0j2FFX5u/GIex0Ik8Kx8QMIJx5ZWVdC2PcZL+tjcrCDE03G j1VzWG34JXnWF6d88gGW/+3XDXqIAU6+A/s64YOVsuCHB07O9K1+lIdAWfP+715EwoWl PrLH+bYUASKARkPCm5xQ6T3iJu+sy7Hevj208CLv5coSqqipxgx4nfiaaHcKDf/vbFdC qhYA== X-Gm-Message-State: APjAAAX+W4pU3FTEwZbgahXVpGqx51X5QSe6ZmC51DQsNB4nzVzL/MW1 +z3SPo54EkgDQmGIhSvogcXo6xQs2IY= X-Received: by 2002:a6b:e30e:: with SMTP id u14mr7581903ioc.242.1579708293721; Wed, 22 Jan 2020 07:51:33 -0800 (PST) Received: from [192.168.1.159] ([65.144.74.34]) by smtp.gmail.com with ESMTPSA id y26sm812138iob.88.2020.01.22.07.51.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 22 Jan 2020 07:51:33 -0800 (PST) To: Linus Torvalds Cc: io-uring , "linux-kernel@vger.kernel.org" From: Jens Axboe Subject: [GIT PULL] io_uring fix for 5.5-final Message-ID: <98957d45-ad2a-9505-9771-63828538f3bf@kernel.dk> Date: Wed, 22 Jan 2020 08:51:31 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, This was supposed to have gone in last week, but due to a brain fart on my part, I forgot that we made this struct addition in the 5.5 cycle. So here it is for 5.5, to prevent having a 32 vs 64-bit compatability issue with the files_update command. Please pull! git://git.kernel.dk/linux-block.git tags/io_uring-5.5-2020-01-22 ---------------------------------------------------------------- Eugene Syromiatnikov (1): io_uring: fix compat for IORING_REGISTER_FILES_UPDATE fs/io_uring.c | 4 +++- include/uapi/linux/io_uring.h | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) -- Jens Axboe