[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <DC148C5AA1CEBA4E87973D432B1C2D8825F992CA@P3PWEX4MB008.ex4.secureserver.net>
Date: Thu, 11 Sep 2014 22:00:32 +0000
From: Hartley Sweeten <HartleyS@...ionengravers.com>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
CC: Ian Abbott <abbotti@....co.uk>,
"driverdev-devel@...uxdriverproject.org"
<driverdev-devel@...uxdriverproject.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [PATCH 00/48] staging: comedi: avoid using comedi_board()
On Thursday, September 11, 2014 2:38 PM, Greg Kroah-Hartman wrote:
> On Thu, Sep 11, 2014 at 05:57:34PM +0000, Hartley Sweeten wrote:
>> Just wanted to give you a heads up on this series and the ones I have
>> posted. The series are:
>>
>>> From Ian, [PATCH 00/48] staging: comedi: avoid using comedi_board()
>>> From me, [PATCH 00/30] staging: comedi: adl_pci9118: continue cleanup
>>> From me, [PATCH 00/34] staging: comedi: cleanup async cmd->stop_{src,arg} usage
>>
>> There are a couple conflicts between the series from Ian and my two.
>> If you drop these two from Ian's series:
>>
>> 06) staging: comedi: adl_pci9118: replace comedi_board() calls
>> 10) staging: comedi: amplc_dio200_common: replace comedi_board() calls
>>
>> The rest will apply cleanly in the order above (assuming I didn't miss anything).
>
> I applied all of the above, with the 2 patches from Ian going last and
> git handling the merge issues.
>
>> Also, Ian had a couple issues with patch 07/34 and 08/34 from the last
>> series I posted. I already asked if you could drop those two. I needed I
>> will repost the series.
>
> I've dropped them. Hopefully I got it all right, it should all be
> pushed out now, verifying this would be good :)
A quick glance looks like everything is right. I'll give it a better look
when it hits linux-next.
Thanks,
Hartley
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists