From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Christian Brauner <christian.brauner@ubuntu.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] Some fixes for v5.11
Date: Tue, 15 Dec 2020 15:37:51 +1100 [thread overview]
Message-ID: <20201215153751.5150e00a@canb.auug.org.au> (raw)
In-Reply-To: <CAHk-=wic8QjSuwjwpk8oLvtgWWCGfAC72ojuAU3PwYr7CWHqHg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 875 bytes --]
Hi Linus,
On Mon, 14 Dec 2020 16:45:50 -0800 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> On Mon, Dec 14, 2020 at 5:27 AM Christian Brauner
> <christian.brauner@ubuntu.com> wrote:
> >
> > /* Conflicts */
> > At the time of creating this PR no merge conflicts were reported from
> > linux-next and no merge conflict with 2c85ebc57b3e ("Linux 5.10") when
> > pulling the tag.
>
> Really? It conflicted with your own time namespace fixes.. Was one or
> the other not in linux-next?
>
> Not that the conflicts were big or bad (free_time_ns() prototype
> changed right next to timens_on_fork() prototype), I'm just surprised
> you saw no conflicts..
The time namespace changes appear in linux-next for the first time
today - where I reported that 3 of them have no Signed-off-by from their
committer :-(.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-12-15 4:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 13:27 [GIT PULL] Some fixes for v5.11 Christian Brauner
2020-12-15 0:45 ` Linus Torvalds
2020-12-15 4:37 ` Stephen Rothwell [this message]
2020-12-15 9:33 ` Christian Brauner
2020-12-15 9:31 ` Christian Brauner
2020-12-15 0:49 ` pr-tracker-bot
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=20201215153751.5150e00a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=christian.brauner@ubuntu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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.