linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Joel Becker <Joel.Becker@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the ocfs2 tree with Linus' tree
Date: Tue, 22 Sep 2009 20:14:50 -0700	[thread overview]
Message-ID: <20090923031450.GB29799@mail.oracle.com> (raw)
In-Reply-To: <20090923104537.2885f67a.sfr@canb.auug.org.au>

On Wed, Sep 23, 2009 at 10:45:37AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the ocfs2 tree got conflicts in
> arch/x86/ia32/ia32entry.S, arch/x86/include/asm/unistd_32.h,
> arch/x86/include/asm/unistd_64.h and arch/x86/kernel/syscall_table_32.S
> between various commits from Linus' tree and commit
> 25767b48501de19421ae86c406b2dd42df37baf3 ("fs: Add the reflink()
> operation and reflinkat(2) system call") from the ocfs2 tree.
> 
> I fixed it up (see below) and can carry the fix for a short while.  Given
> the ongoing discussions about this patch with Linus, however, it may be
> worth dropping for now?

	The syscall is dropping while it's reworked.  I should have a
tree up shortly without the syscall.

Joel

-- 

Life's Little Instruction Book #15

	"Own a great stereo system."

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker@oracle.com
Phone: (650) 506-8127

  reply	other threads:[~2009-09-23  3:16 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-23  0:45 linux-next: manual merge of the ocfs2 tree with Linus' tree Stephen Rothwell
2009-09-23  3:14 ` Joel Becker [this message]
2009-09-23  5:25   ` Stephen Rothwell
2009-12-17 23:51 Stephen Rothwell
2010-08-13  0:33 Stephen Rothwell
2011-03-28  1:00 Stephen Rothwell

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=20090923031450.GB29799@mail.oracle.com \
    --to=joel.becker@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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).