Re: linux-next: manual merge of the osd tree with the nfs tree

2012-08-12 Thread Boaz Harrosh
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

Re: linux-next: manual merge of the osd tree with the nfs tree

2012-08-12 Thread Boaz Harrosh
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

linux-next: manual merge of the osd tree with the nfs tree

2012-08-08 Thread Stephen Rothwell
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

linux-next: manual merge of the osd tree with the nfs tree

2012-08-08 Thread Stephen Rothwell
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