public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rusty Russell <rusty@rustcorp•com.au>
Cc: linux-next@vger•kernel.org
Subject: linux-next: failed import of the rr tree
Date: Thu, 23 Oct 2008 10:29:51 +1100	[thread overview]
Message-ID: <20081023102951.db38e08c.sfr@canb.auug.org.au> (raw)

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

Hi Rusty,

Today's linux-next import of the rr tree failed like this:

virtio:net-mergeable-rx-bufs.patch
error: patch failed: include/linux/virtio_net.h:44
error: include/linux/virtio_net.h: patch does not apply

patch(1) will not apply that patch either ...

$ patch -p1 -E <.dotest/patch 
patching file drivers/net/virtio_net.c
patching file include/linux/virtio_net.h
Hunk #2 FAILED at 45.
1 out of 2 hunks FAILED -- saving rejects to file include/linux/virtio_net.h.rej

I removed that patch from the series today and hope that nothing later
depended on it.

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

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

             reply	other threads:[~2008-10-22 23:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-22 23:29 Stephen Rothwell [this message]
2008-10-23  1:12 ` linux-next: failed import of the rr tree Rusty Russell

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=20081023102951.db38e08c.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=rusty@rustcorp$(echo .)com.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox