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=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 F41FFC43215 for ; Tue, 3 Dec 2019 06:58:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CAFEA206E0 for ; Tue, 3 Dec 2019 06:58:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575356298; bh=NDzHjnZoROStmAmK2kEQvw3sr0Cov3rjYuViMaBgtXw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=vV84F1xedZepy2LOptp+Op5t8pskqEIlvKUvNdcc3ENewVSZZso2JdWlg8Lbb0QdZ n44NM5kK4zjsrSvs1jsSGIvxm7VJXi3tzUbDgH/GIMbFlK11qUZnO20TTk3sU6rY+8 xShZ2wqGGwuuqxmNWWtgLaH4IeHkJ/hoIuzWudHg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727408AbfLCG6R (ORCPT ); Tue, 3 Dec 2019 01:58:17 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:43014 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727340AbfLCG6R (ORCPT ); Tue, 3 Dec 2019 01:58:17 -0500 Received: by mail-wr1-f66.google.com with SMTP id n1so2184523wra.10; Mon, 02 Dec 2019 22:58:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=zF74IGfN8k4r/66rDN9iUDHqi54WQbWfKDWkqcaxjZw=; b=PdZ4+lTwKLhTadzoIBTD+MAdEKy2PGkrU15xlBIIWitCyv1IYwxpgI4BNaX5WW7Iu3 R3Bb34YpH513Zgxv+Pui8YnZ3U9hlnFrabHfQnt7AIpOg8tckDYAj/ZkCtSfBaBl1WPb 7oz1xCuo7Pdu7Dj2p5wy1C8DlL8jyLZqL5DMI7IMnL/m8Mh5Ck0GzH6hxT936JN/n/IJ bfjdCSEvrhxWoi4E6jxbST7u01T+YN2iOnlFEKF1a8wHiZBFESivfIBmlHENFJTKNnnx UgEdRfPqV08ZBNTdglKXGa/RJOBfw7HR9Sp9JfBnug7GqN+6TwqB1J3IjTmSz2c+5Exx Y6fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=zF74IGfN8k4r/66rDN9iUDHqi54WQbWfKDWkqcaxjZw=; b=eC+HNcAR6Ewg0dW+axhxQ8zRnEBlFZCe0CxhTRYllDKJ1+BXvqNNbB6/csJu8qVPqc a9DjyanZenFvabKLGhAmzObtxxRflss4AoYLxauem+9Jqfdd2VbVX+mG6TSu9ooj8EZ+ G29ie0Rfw7eHGvSjDEW11GyWtqqsIDp+tRgCxMq7C49SoYYGkVy2jHG4zhdDAdVH0Wgg O45FMHA86oRsd4RdJ6N/iVDH0qmu9JMqZLNKV6PY0gMwmlwzxg/W9gsYoXSbh01chUUG 6GWFYAAQaEmdhMOpOKBbmBS20QwCgIOyHylGS+d39rcHnf+6EYcQfdWngSQ1+g5d1nZG spyg== X-Gm-Message-State: APjAAAVVogUEDPljY9ZfWlQvVoMDb+B/CJy79TqERAXhCw2+ILmqOaTY wFy54OB5OsS3ytgxz9y7cwU= X-Google-Smtp-Source: APXvYqzDUtSY4j2FaTqaOLrl5xV1xcEZrpY5GUGhDwiA72WNVMfQoHhvDxH5M8QSY5J/ezF6uJMc0Q== X-Received: by 2002:a5d:5284:: with SMTP id c4mr3141134wrv.376.1575356295012; Mon, 02 Dec 2019 22:58:15 -0800 (PST) Received: from gmail.com (54033286.catv.pool.telekom.hu. [84.3.50.134]) by smtp.gmail.com with ESMTPSA id r15sm1915483wmh.21.2019.12.02.22.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 22:58:14 -0800 (PST) Date: Tue, 3 Dec 2019 07:58:12 +0100 From: Ingo Molnar To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Arnd Bergmann , Linux Next Mailing List , Linux Kernel Mailing List , Dmitry Safonov Subject: Re: linux-next: manual merge of the y2038 tree with the tip tree Message-ID: <20191203065812.GB115767@gmail.com> References: <20191127130139.0b16375c@canb.auug.org.au> <20191203140259.33291393@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191203140259.33291393@canb.auug.org.au> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Stephen Rothwell wrote: > Hi all, > > This is now a conflict between the tip tree and Linus' tree. This too should be resolved in my latest update of the -next integration branch tip:auto-latest. Thanks, Ingo