Re: [PATCH 00/31] CAPI: Major rework, tons of bug fixes

[David Miller]

From: Jan Kiszka <jan.kiszka@xxxxxx>
Date: Sat, 23 Jan 2010 00:03:26 +0100

> First of all sorry if I'm breaking the correct flow of ISDN patches, but
> I'm under the impression that things currently get merged directly via
> Dave, right?
> 
> This series can also be pulled from
> 
> 	git://git.kiszka.org/linux-2.6.git capi

This doesn't pull cleanly into net-next-2.6 which is where I would
be adding it.

There were a bunch of changes to the procfs code here and it conflicts
with your changes.

Please do a merge and sort things out, and then send another
pull request.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/