From: Boaz Harrosh <bharrosh@panasas.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Trond Myklebust <trond.myklebust@fys.uio.no>
Subject: Re: linux-next: manual merge of the osd tree with the nfs tree
Date: Sun, 12 Aug 2012 18:13:58 +0300 [thread overview]
Message-ID: <5027C836.4070904@panasas.com> (raw)
In-Reply-To: <20120809100328.b8d6af3b95e1537ffcb7b053@canb.auug.org.au>
On 08/09/2012 03:03 AM, Stephen Rothwell wrote:
> Hi Boaz,
>
> Today's linux-next merge of the osd tree got a conflict in
> fs/nfs/nfs4proc.c between commit 47fbf7976e0b ("NFSv4.1: Remove a bogus
> BUG_ON() in nfs4_layoutreturn_done") from the nfs tree and commit
> d8e8b68405db ("pnfs: Don't BUG on info received from Server") from the
> osd tree.
>
> I just used the nfs tree version.
Sorry, was on vacation will fix right now. Your fix was correct
Thanks
Boaz
prev parent reply other threads:[~2012-08-12 15:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-09 0:03 linux-next: manual merge of the osd tree with the nfs tree Stephen Rothwell
2012-08-12 15:13 ` Boaz Harrosh [this message]
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=5027C836.4070904@panasas.com \
--to=bharrosh@panasas.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=trond.myklebust@fys.uio.no \
/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).