From: ebiederm@xmission.com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the userns tree with the y2038 tree
Date: Thu, 04 Oct 2018 09:14:26 +0200 [thread overview]
Message-ID: <87efd6mbe5.fsf@xmission.com> (raw)
In-Reply-To: <20181004161107.77a010e9@canb.auug.org.au> (Stephen Rothwell's message of "Thu, 4 Oct 2018 16:11:07 +1000")
Stephen Rothwell <sfr@canb.auug.org.au> 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
prev parent reply other threads:[~2018-10-04 7:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-04 6:11 linux-next: manual merge of the userns tree with the y2038 tree Stephen Rothwell
2018-10-04 7:14 ` Eric W. Biederman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87efd6mbe5.fsf@xmission.com \
--to=ebiederm@xmission.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.