From: Stephen Rothwell <sfr@canb.auug.org.au>
To: James Morris <jmorris@namei.org>
Cc: Kees Cook <keescook@chromium.org>,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org,
Pranith Kumar <bobby.prani@gmail.com>
Subject: Re: [PULL] seccomp update (next)
Date: Thu, 27 Nov 2014 08:46:14 +1100 [thread overview]
Message-ID: <20141127084614.209450b9@canb.auug.org.au> (raw)
In-Reply-To: <alpine.LRH.2.11.1411270022240.22560@namei.org>
[-- Attachment #1: Type: text/plain, Size: 1412 bytes --]
Hi James,
On Thu, 27 Nov 2014 00:23:06 +1100 (AEDT) James Morris <jmorris@namei.org> wrote:
>
> On Tue, 25 Nov 2014, Kees Cook wrote:
>
> > Please pull these seccomp changes for next.
> >
> > Thanks!
> >
> > -Kees
> >
> > The following changes since commit 5d01410fe4d92081f349b013a2e7a95429e4f2c9:
> >
> > Linux 3.18-rc6 (2014-11-23 15:25:20 -0800)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git tags/seccomp-next
> >
> > for you to fetch changes up to cb24de187b9a0717246f05afc0f2be070e075d80:
> >
> > seccomp: Replace smp_read_barrier_depends() with lockless_dereference() (2014-11-25 11:40:24 -0800)
> >
> > ----------------------------------------------------------------
> > Improves SMP dereferencing with new macro.
> >
> > ----------------------------------------------------------------
> > Pranith Kumar (1):
> > seccomp: Replace smp_read_barrier_depends() with lockless_dereference()
> >
> > kernel/seccomp.c | 7 +++----
> > 1 file changed, 3 insertions(+), 4 deletions(-)
> >
>
> This is what I get when pulling to my next branch:
>
> 9128 files changed, 468773 insertions(+), 340317 deletions(-)
That would be because your tree is based on v3.17 and Kees' is based on
v3.18-rc6 ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-11-26 21:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-25 19:43 [PULL] seccomp update (next) Kees Cook
2014-11-26 13:23 ` James Morris
2014-11-26 21:46 ` Stephen Rothwell [this message]
2014-11-26 21:59 ` Kees Cook
2014-11-27 23:37 ` James Morris
2014-12-01 20:34 ` Kees Cook
2014-12-01 22:56 ` James Morris
2014-12-01 23:06 ` Kees Cook
2014-12-02 7:56 ` James Morris
2015-07-15 18:56 Kees Cook
2015-07-20 6:58 ` James Morris
2016-01-05 23:40 Kees Cook
2016-06-14 17:57 Kees Cook
2016-06-17 7:15 ` James Morris
2016-06-17 18:55 ` Andy Lutomirski
2016-06-18 7:02 ` Kees Cook
2016-06-18 10:21 ` Andy Lutomirski
2016-06-19 22:45 ` Andy Lutomirski
2016-07-07 17:59 Kees Cook
2016-07-07 23:47 ` 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=20141127084614.209450b9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bobby.prani@gmail.com \
--cc=jmorris@namei.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).