[parisc-linux] Merge error in pa55 tree ??

[Matthew Wilcox]

On Tue, Jul 16, 2002 at 04:11:28PM +0100, Alan Cox wrote:
> diff -u --new-file --recursive --exclude-from /usr/src/exclude
> linux.vanilla/ar
> --- linux.vanilla/arch/ia64/kernel/perfmon.c    Fri Nov  9 22:26:17 2001
> +++ linux-hppa/arch/ia64/kernel/perfmon.c       Wed Aug 15 18:07:26 2001
> @@ -38,7 +38,7 @@  
>  
>  #ifdef CONFIG_PERFMON
>  
> -#define PFM_VERSION            "0.3"
> +#define PFM_VERSION            "0.2"
>  #define PFM_SMPL_HDR_VERSION   1
>  
>  #define PMU_FIRST_COUNTER      4       /* first generic counter */
> @@ -52,7 +52,6 @@
>  #define PFM_DISABLE            0xa6    /* freeze only */
>  #define PFM_RESTART            0xcf
>  #define PFM_CREATE_CONTEXT     0xa7

looks like a problem in the cvs tree.  paul, could you look at this?
some interesting bits from the log:

----------------------------
revision 1.6
date: 2001/08/15 17:07:26;  author: bame;  state: Exp;  lines: +7 -17
merged 2.4.8 upstream
----------------------------
revision 1.1
date: 2000/03/15 21:02:27;  author: mang;  state: dead;
branches:  1.1.1;  1.1.2;
file perfmon.c was initially added on branch linus.
----------------------------
revision 1.1.2.1
date: 2000/03/15 21:02:27;  author: mang;  state: Exp;  lines: +244 -0
Update the linus branch to Linus' 2.3.99-pre1. 2.4 is right around
the corner.
----------------------------
revision 1.1.1.6
date: 2001/11/28 05:36:30;  author: bame;  state: Exp;  lines: +729 -388
updating branch linus to LINUS_2416


-- 
Revolutions do not require corporate support.