public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Martin Schwidefsky <schwidefsky@de•ibm.com>
Cc: Avi Kivity <avi@qumranet•com>,
	Marcelo Tosatti <mtosatti@redhat•com>,
	linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Cornelia Huck <cornelia.huck@de•ibm.com>,
	Gleb Natapov <gleb@redhat•com>,
	Heiko Carstens <heiko.carstens@de•ibm.com>
Subject: Re: linux-next: manual merge of the kvm tree with the s390 tree
Date: Thu, 3 Jan 2013 21:56:42 +1100	[thread overview]
Message-ID: <20130103215642.b7f641ecc107fd65bdd5eefe@canb.auug.org.au> (raw)
In-Reply-To: <20130103083155.5cc97c31@mschwide>

[-- Attachment #1: Type: text/plain, Size: 537 bytes --]

Hi Martin,

On Thu, 3 Jan 2013 08:31:55 +0100 Martin Schwidefsky <schwidefsky@de•ibm.com> 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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

next prev parent reply	other threads:[~2013-01-03 10:56 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-03  1:06 linux-next: manual merge of the kvm tree with the s390 tree Stephen Rothwell
2013-01-03  7:31 ` Martin Schwidefsky
2013-01-03 10:56   ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-05-29  6:46 Stephen Rothwell
2020-06-04  3:05 ` Stephen Rothwell
2016-07-14  4:03 Stephen Rothwell
2016-07-14  6:58 ` David Hildenbrand
2016-06-29  4:36 Stephen Rothwell
2016-06-29  5:47 ` Heiko Carstens
2014-10-07  4:59 Stephen Rothwell
2013-06-06  3:55 Stephen Rothwell
2012-08-16  3:49 Stephen Rothwell
2011-09-21  3:55 Stephen Rothwell
2010-10-21  1:16 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130103215642.b7f641ecc107fd65bdd5eefe@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=avi@qumranet$(echo .)com \
    --cc=cornelia.huck@de$(echo .)ibm.com \
    --cc=gleb@redhat$(echo .)com \
    --cc=heiko.carstens@de$(echo .)ibm.com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=mtosatti@redhat$(echo .)com \
    --cc=schwidefsky@de$(echo .)ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox