* linux-next: manual merge of the osd tree with the nfs tree
@ 2012-08-09 0:03 Stephen Rothwell
2012-08-12 15:13 ` Boaz Harrosh
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2012-08-09 0:03 UTC (permalink / raw)
To: Boaz Harrosh; +Cc: linux-next, linux-kernel, Trond Myklebust
[-- Attachment #1: Type: text/plain, Size: 404 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the osd tree with the nfs tree
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
0 siblings, 0 replies; 3+ messages in thread
From: Boaz Harrosh @ 2012-08-12 15:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Trond Myklebust
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the osd tree with the nfs tree
@ 2012-08-12 15:13 ` Boaz Harrosh
0 siblings, 0 replies; 3+ messages in thread
From: Boaz Harrosh @ 2012-08-12 15:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Trond Myklebust
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-12 15:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2012-08-12 15:13 ` Boaz Harrosh
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.