On Tue, 2015-08-11 at 06:47 +0000, Koul, Vinod wrote:
> On Thu, Aug 06, 2015 at 10:43:03AM -0700, Dave Jiang wrote:
> > The following series implements refactoring of the ioatdma. The
> > older
> > ioatdma support has been deprecated. Namely v1 and v2 of ioatdma.
> > The
> > driver will exclusively support v3+. This flattens the driver and
> > removes
> > a lot of legacy code in order to make the driver more maintainable.
> >
> > v2:
> > - Rebased to slave-dma/next branch.
> Okay here is where i faced trouble :(
>
> So few fixes have gone into the Linus tree for ioat so next one
> doesnt work
> for me. My for-linus which will goto linus will be based out of rc1
> so can
> you rebase it again on rc1 and resend
>
> Btw what about conflicts with ones in fixes?
>
If I rebase it againt rc1, it will conflict with 7618d03 dmaengine:
ioatdma: Set non RAID channels to be private capable. That's why it was
rebased against your next branch. Do I rebase against for-linus branch?
��.n��������+%������w��{.n��������)�)�� jg��� �����ݢj����G���� ���j:+v���w�m������w�������h�����٥
