public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Nick Warne <nick@linicks.net>
To: linux-kernel@vger.kernel.org
Cc: Greg KH <gregkh@suse.de>, Chris Wright <chrisw@osdl.org>
Subject: 2.6.14.1/2 patch Makefile hunk FAILED
Date: Fri, 11 Nov 2005 16:48:35 +0000	[thread overview]
Message-ID: <200511111648.35632.nick@linicks.net> (raw)

Hi all,

Just an eyes-up here - applying the combined 2.6.14.1/2 patch from kernel.org

http://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv2.6%2Fincr%2Fpatch-2.6.14.1-2.bz2

produces REJ on Makefile when applied to virgin 2.6.14 as EXTRAVERSION 
isn't .1:


***************
*** 1,7 ****
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 14
- EXTRAVERSION = .1
  NAME=Affluent Albatross

  # *DOCUMENTATION*
--- 1,7 ----
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 14
+ EXTRAVERSION = .2
  NAME=Affluent Albatross

  # *DOCUMENTATION*



Simple to fix manually though.

Nick
-- 
http://sourceforge.net/projects/quake2plus

"Person who say it cannot be done should not interrupt person doing it."
-Chinese Proverb


             reply	other threads:[~2005-11-11 16:48 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-11-11 16:48 Nick Warne [this message]
2005-11-11 16:52 ` 2.6.14.1/2 patch Makefile hunk FAILED Nick Warne
2005-11-11 17:04 ` Gene Heskett

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=200511111648.35632.nick@linicks.net \
    --to=nick@linicks.net \
    --cc=chrisw@osdl.org \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

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

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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