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=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham 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 A41FDC64EBC for ; Thu, 4 Oct 2018 07:14:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A050213A2 for ; Thu, 4 Oct 2018 07:14:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A050213A2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xmission.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727586AbeJDOGl (ORCPT ); Thu, 4 Oct 2018 10:06:41 -0400 Received: from out02.mta.xmission.com ([166.70.13.232]:56181 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727058AbeJDOGk (ORCPT ); Thu, 4 Oct 2018 10:06:40 -0400 Received: from in01.mta.xmission.com ([166.70.13.51]) by out02.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.87) (envelope-from ) id 1g7xqU-000668-7f; Thu, 04 Oct 2018 01:14:50 -0600 Received: from [105.184.227.67] (helo=x220.xmission.com) by in01.mta.xmission.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.87) (envelope-from ) id 1g7xqE-0002cw-9G; Thu, 04 Oct 2018 01:14:49 -0600 From: ebiederm@xmission.com (Eric W. Biederman) To: Stephen Rothwell Cc: Arnd Bergmann , Linux-Next Mailing List , Linux Kernel Mailing List References: <20181004161107.77a010e9@canb.auug.org.au> Date: Thu, 04 Oct 2018 09:14:26 +0200 In-Reply-To: <20181004161107.77a010e9@canb.auug.org.au> (Stephen Rothwell's message of "Thu, 4 Oct 2018 16:11:07 +1000") Message-ID: <87efd6mbe5.fsf@xmission.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-XM-SPF: eid=1g7xqE-0002cw-9G;;;mid=<87efd6mbe5.fsf@xmission.com>;;;hst=in01.mta.xmission.com;;;ip=105.184.227.67;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX18AOpEaZC8k7zirbzXxHpExPHyBJ8l4sUE= X-SA-Exim-Connect-IP: 105.184.227.67 X-SA-Exim-Mail-From: ebiederm@xmission.com Subject: Re: linux-next: manual merge of the userns tree with the y2038 tree X-SA-Exim-Version: 4.2.1 (built Thu, 05 May 2016 13:38:54 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell writes: > Hi Eric, > > Today's linux-next merge of the userns tree got a conflict in: > > kernel/signal.c > > between commit: > > 49c39f8464a9 ("y2038: signal: Change rt_sigtimedwait to use __kernel_timespec") > > from the y2038 tree and commit: > > ae7795bc6187 ("signal: Distinguish between kernel_siginfo and siginfo") > > from the userns tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. Thank you. This is good to know about. Eric