Re: linux-next: manual merge of the kvm tree with the s390 tree

From: Stephen Rothwell
Date: Thu Jan 03 2013 - 05:56:47 EST

Hi Martin,

On Thu, 3 Jan 2013 08:31:55 +0100 Martin Schwidefsky <schwidefsky@xxxxxxxxxx> wrote:
> I surprises me a bit that there is only one hunk in the cleanup patch.
> I expected three, the above for virtio_ccw.c, one for irq.c and another
> for irq.h. I checked the resulting tree which is correct! The merge diff
> has a '++' line for irq.c/irq.h:

Those bits were further down in the mail I sent you (after my signature).

Thanks for checking.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature