All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Howells <dhowells@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: dhowells@redhat.com, James Morris <jmorris@namei.org>,
	linux-next@vger.kernel.org, Miloslav Trmac <mitr@redhat.com>,
	Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: linux-next: manual merge of the security-testing tree
Date: Tue, 09 Dec 2008 15:28:01 +0000	[thread overview]
Message-ID: <31186.1228836481@redhat.com> (raw)
In-Reply-To: <20081209164026.022dfa39.sfr@canb.auug.org.au>

Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the security-testing tree got a conflict in
> drivers/char/tty_audit.c between commit
> 49518720d67042cf431e7f96aed5b0f5c51a84e3 ("[PATCH] Audit: Log TIOCSTI")
> from the audit-current tree and commit
> 66303bce9b924e35e435d35409d3abc371755767 ("CRED: Wrap task credential
> accesses in the tty driver") from the security-testing tree.
> 
> The former moved the code that the latter was modifying.  I fixed it up
> (see below) and can carry the fix as necessary.

Your changes look okay.

David

  reply	other threads:[~2008-12-09 15:28 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-09  5:40 linux-next: manual merge of the security-testing tree Stephen Rothwell
2008-12-09 15:28 ` David Howells [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-12-02  4:06 Stephen Rothwell
2008-11-25  8:11 Stephen Rothwell
2008-11-25 11:04 ` David Howells
2008-11-25 21:49 ` J. Bruce Fields
2008-11-20  5:37 Stephen Rothwell
2008-12-31  1:50 ` Stephen Rothwell
2009-01-03 22:55   ` David Howells
2008-11-17  4:44 Stephen Rothwell
2008-11-18  7:55 ` 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=31186.1228836481@redhat.com \
    --to=dhowells@redhat.com \
    --cc=jmorris@namei.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mitr@redhat.com \
    --cc=sfr@canb.auug.org.au \
    --cc=viro@zeniv.linux.org.uk \
    /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.