Messages in this thread | | | Date | Tue, 15 Dec 2020 10:33:24 +0100 | From | Christian Brauner <> | Subject | Re: [GIT PULL] Some fixes for v5.11 |
| |
On Tue, Dec 15, 2020 at 03:37:51PM +1100, Stephen Rothwell wrote: > 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 :-(.
This was my bad. I'm adding a script to verify that all commits are signed-off by me when I commit them.
Christian
| |