On Mon, 16 Mar 2009 17:07:24 +1100
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the bkl-removal tree got a conflict in
> fs/pipe.c between commit e5bc49ba7439b9726006d031d440cba96819f0f8
> ("pipe_rdwr_fasync: fix the error handling to prevent the leak/crash")
> from Linus' tree and commit 5c7eec1a9b90b18837a45cccb7fe3c182dce57d0
> ("Rationalize fasync return values") from the bkl-removal tree.
Sigh, I knew that was coming too, sorry. I'll just pull the
bkl-removal tree forward, that should make that particular problem go
away.
Thanks,
jon
Jonathan Corbet / LWN.net / corbet@xxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
