[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100123.011824.39481030.davem@davemloft.net>
Date: Sat, 23 Jan 2010 01:18:24 -0800 (PST)
From: David Miller <davem@...emloft.net>
To: jan.kiszka@....de
Cc: isdn@...ux-pingi.de, linux-kernel@...r.kernel.org,
i4ldeveloper@...tserv.isdn4linux.de,
isdn4linux@...tserv.isdn4linux.de, netdev@...r.kernel.org
Subject: Re: [PATCH 00/31] CAPI: Major rework, tons of bug fixes
From: Jan Kiszka <jan.kiszka@....de>
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 netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists