From: Christian Brauner <christian.brauner@ubuntu.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] Some fixes for v5.11
Date: Tue, 15 Dec 2020 10:31:40 +0100 [thread overview]
Message-ID: <20201215093140.uin7tveoa6hg3ulb@wittgenstein> (raw)
In-Reply-To: <CAHk-=wic8QjSuwjwpk8oLvtgWWCGfAC72ojuAU3PwYr7CWHqHg@mail.gmail.com>
On Mon, Dec 14, 2020 at 04:45:50PM -0800, Linus Torvalds 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?
Oh sorry, I guess you didn't see that. The simple time namespace fixes
didn't make it into -next because I missed to merge them into my
for-next branch when I took them. I did mention it in the
time-namespace-v5.11 pull-request in the /* Testing */ section but
apparently this wasn't prominent enough.
"Please note that I missed to merge these fixes into my for-next branch and so
linux-next has not contained the commits in this pr.
I'm still sending this pr because these are fairly trivial bugfixes and have
seen vetting from multiple people. I have also now merged this tag into my
for-next branch so these commits will show up in linux-next soon. If you feel
more comfortable with this sitting in linux-next for a while please just ignore
this pr and I'll resend after rc1 has been released."
>
> 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..
Hm, I did pull linux-next 20201214 and then did a pull from my tag. And
as usual I always do a test-pull based on v5.* releaste tag and they
didn't show any merge conflicts.
>
> It may be that Stephen didn't even bother reporting them as trivial.
No, this was definitely my fault. I'll try to make sure this won't
repeat. Thanks for still pulling.
Christian
next prev parent reply other threads:[~2020-12-15 9:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 13:27 Christian Brauner
2020-12-15 0:45 ` Linus Torvalds
2020-12-15 4:37 ` Stephen Rothwell
2020-12-15 9:33 ` Christian Brauner
2020-12-15 9:31 ` Christian Brauner [this message]
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=20201215093140.uin7tveoa6hg3ulb@wittgenstein \
--to=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®