All of lore.kernel.org
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: David Howells <dhowells@redhat.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Jarkko Sakkinen" <jarkko@kernel.org>,
	"Alexander A. Klimov" <grandmaster@al2klimov.de>,
	"Gustavo A. R. Silva" <gustavoars@kernel.org>,
	"Alex Shi" <alex.shi@linux.alibaba.com>,
	"Ben Boeckel" <mathstuf@gmail.com>,
	"Denis Efremov" <efremov@linux.com>,
	"Gabriel Krisman Bertazi" <krisman@collabora.com>,
	"Jann Horn" <jannh@google.com>,
	"Krzysztof Kozlowski" <krzk@kernel.org>,
	"Mickaël Salaün" <mic@linux.microsoft.com>,
	"Mimi Zohar" <zohar@linux.vnet.ibm.com>,
	"Randy Dunlap" <rdunlap@infradead.org>,
	"Tianjia Zhang" <tianjia.zhang@linux.alibaba.com>,
	"Tom Rix" <trix@redhat.com>, YueHaibing <yuehaibing@huawei.com>,
	keyrings@vger.kernel.org,
	"Linux Crypto Mailing List" <linux-crypto@vger.kernel.org>,
	"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
	"LSM List" <linux-security-module@vger.kernel.org>
Subject: Re: [GIT PULL] keys: Collected minor fixes and cleanups
Date: Mon, 14 Dec 2020 13:05:51 -0800	[thread overview]
Message-ID: <CAADWXX83JC0oSVoDxOwsLE1DPm8r6JLWcAsP0UyCLO_X544pkQ@mail.gmail.com> (raw)
In-Reply-To: <CAHk-=wido5stGfFtRzmW19bB1w2XQAuY8oxUtFN2ZWdk2Grq-w@mail.gmail.com>

On Mon, Dec 14, 2020 at 12:49 PM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> I suspect the fix is trivial (change the "," to "|"), but I will not
> be pulling this - or anything else that hasn't been in linux-next -
> from you this merge window.

It looks like Stephen Rothwell saw it in next yesterday, and fixed it
up there in his merge.

So somebody was aware of the problem. But unlike Stephen, I don't take
broken code and just silently fix it up in the merge.

I suspect Stephen might have thought it was a merge conflict fix,
rather than just a broken branch.

Stephen: that makes linux-next test coverage kind of pointless, if you
just fix bugs in the branches you merge. You should reject things more
aggressively, rather than make them "pass" in Linux-next.

              Linus

  reply	other threads:[~2020-12-14 21:07 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-14 10:03 [GIT PULL] keys: Collected minor fixes and cleanups David Howells
2020-12-14 20:49 ` Linus Torvalds
2020-12-14 21:05   ` Linus Torvalds [this message]
2020-12-14 21:40     ` Stephen Rothwell
2020-12-15  4:57   ` Jarkko Sakkinen
2021-02-10 14:59 David Howells
2021-02-24  0:32 ` 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=CAADWXX83JC0oSVoDxOwsLE1DPm8r6JLWcAsP0UyCLO_X544pkQ@mail.gmail.com \
    --to=torvalds@linux-foundation.org \
    --cc=alex.shi@linux.alibaba.com \
    --cc=dhowells@redhat.com \
    --cc=efremov@linux.com \
    --cc=grandmaster@al2klimov.de \
    --cc=gustavoars@kernel.org \
    --cc=jannh@google.com \
    --cc=jarkko@kernel.org \
    --cc=keyrings@vger.kernel.org \
    --cc=krisman@collabora.com \
    --cc=krzk@kernel.org \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=mathstuf@gmail.com \
    --cc=mic@linux.microsoft.com \
    --cc=rdunlap@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tianjia.zhang@linux.alibaba.com \
    --cc=trix@redhat.com \
    --cc=yuehaibing@huawei.com \
    --cc=zohar@linux.vnet.ibm.com \
    /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.