From: Greg KH <gregkh@linuxfoundation.org>
To: James Morris <jmorris@namei.org>
Cc: linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [GIT PULL] Keys: fix C++ reserved word issue
Date: Tue, 25 Sep 2018 11:41:47 +0200 [thread overview]
Message-ID: <20180925094147.GC21972@kroah.com> (raw)
In-Reply-To: <alpine.LRH.2.21.1809250738020.27047@namei.org>
On Tue, Sep 25, 2018 at 07:40:06AM +1000, James Morris wrote:
> Please pull this revert and update, from David Howells:
>
> "Here's a pair of fixes that need to go upstream asap, please:
>
> (1) Revert an incorrect fix to the keyrings UAPI for a C++ reserved word
> used as a struct member name. This change being reverted breaks
> existing userspace code and is thus incorrect.
>
> Further, *neither* name is consistent with the one in the keyutils
> package public header.
>
> (2) Fix the problem by using a union to make the name from keyutils
> available in parallel and make the 'private' name unavailable in C++
> with cpp-conditionals."
>
> ---
> The following changes since commit 02214bfc89c71bcc5167f653994cfa5c57f10ff1:
>
> Merge tag 'media/v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (2018-09-24 15:16:41 +0200)
{sigh}
$ date --date="2018-09-25 07:40:06 +1000" +%s
1537825206
$ date --date="2018-09-24 15:16:41 +0200" +%s
1537795001
$ bc <<< "1537825206-1537795001"
30205
$ date -ud "@30205" +'%H hours %M minutes %S seconds'
08 hours 23 minutes 25 seconds
8.5 hours seems like a short amount of time for something to sit in a
tree before asking for it to be merged. Wait, it's actually less than
that, I just took into account the longest possible time it could have
been in your tree.
I'll wait a few days on this one...
thanks,
greg k-h
WARNING: multiple messages have this Message-ID (diff)
From: gregkh@linuxfoundation.org (Greg KH)
To: linux-security-module@vger.kernel.org
Subject: [GIT PULL] Keys: fix C++ reserved word issue
Date: Tue, 25 Sep 2018 11:41:47 +0200 [thread overview]
Message-ID: <20180925094147.GC21972@kroah.com> (raw)
In-Reply-To: <alpine.LRH.2.21.1809250738020.27047@namei.org>
On Tue, Sep 25, 2018 at 07:40:06AM +1000, James Morris wrote:
> Please pull this revert and update, from David Howells:
>
> "Here's a pair of fixes that need to go upstream asap, please:
>
> (1) Revert an incorrect fix to the keyrings UAPI for a C++ reserved word
> used as a struct member name. This change being reverted breaks
> existing userspace code and is thus incorrect.
>
> Further, *neither* name is consistent with the one in the keyutils
> package public header.
>
> (2) Fix the problem by using a union to make the name from keyutils
> available in parallel and make the 'private' name unavailable in C++
> with cpp-conditionals."
>
> ---
> The following changes since commit 02214bfc89c71bcc5167f653994cfa5c57f10ff1:
>
> Merge tag 'media/v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (2018-09-24 15:16:41 +0200)
{sigh}
$ date --date="2018-09-25 07:40:06 +1000" +%s
1537825206
$ date --date="2018-09-24 15:16:41 +0200" +%s
1537795001
$ bc <<< "1537825206-1537795001"
30205
$ date -ud "@30205" +'%H hours %M minutes %S seconds'
08 hours 23 minutes 25 seconds
8.5 hours seems like a short amount of time for something to sit in a
tree before asking for it to be merged. Wait, it's actually less than
that, I just took into account the longest possible time it could have
been in your tree.
I'll wait a few days on this one...
thanks,
greg k-h
next prev parent reply other threads:[~2018-09-25 9:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-24 21:40 [GIT PULL] Keys: fix C++ reserved word issue James Morris
2018-09-24 21:40 ` James Morris
2018-09-25 9:41 ` Greg KH [this message]
2018-09-25 9:41 ` Greg KH
2018-09-25 10:17 ` David Howells
2018-09-25 10:17 ` David Howells
2018-09-25 11:30 ` Greg KH
2018-09-25 11:30 ` Greg KH
2018-09-25 18:07 ` James Morris
2018-09-25 18:07 ` James Morris
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=20180925094147.GC21972@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=dhowells@redhat.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@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.