Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750889AbVKKQsq (ORCPT ); Fri, 11 Nov 2005 11:48:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750883AbVKKQsq (ORCPT ); Fri, 11 Nov 2005 11:48:46 -0500 Received: from mail.linicks.net ([217.204.244.146]:38811 "EHLO linux233.linicks.net") by vger.kernel.org with ESMTP id S1750887AbVKKQsp (ORCPT ); Fri, 11 Nov 2005 11:48:45 -0500 From: Nick Warne To: linux-kernel@vger.kernel.org Subject: 2.6.14.1/2 patch Makefile hunk FAILED Date: Fri, 11 Nov 2005 16:48:35 +0000 User-Agent: KMail/1.8.1 Cc: Greg KH , Chris Wright MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200511111648.35632.nick@linicks.net> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 972 Lines: 44 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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/