[JFFS2] Tidy up licensing/copyright boilerplate.

In particular, remove the bit in the LICENCE file about contacting
Red Hat for alternative arrangements. Their errant IS department broke
that arrangement a long time ago -- the policy of collecting copyright
assignments from contributors came to an end when the plug was pulled on
the servers hosting the project, without notice or reason.

We do still dual-license it for use with eCos, with the GPL+exception
licence approved by the FSF as being GPL-compatible. It's just that nobody
has the right to license it differently.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/fs/jffs2/LICENCE b/fs/jffs2/LICENCE
index cd81d83..5628859 100644 (file)
--- a/fs/jffs2/LICENCE
+++ b/fs/jffs2/LICENCE
@@ -1,7 +1,7 @@
 The files in this directory and elsewhere which refer to this LICENCE
 file are part of JFFS2, the Journalling Flash File System v2.
 
-       Copyright (C) 2001, 2002 Red Hat, Inc.
+       Copyright © 2001-2007 Red Hat, Inc. and others
 
 JFFS2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -28,8 +28,3 @@ of the GNU General Public License.
 This exception does not invalidate any other reasons why a work based on
 this file might be covered by the GNU General Public License.
 
-For information on obtaining alternative licences for JFFS2, see 
-http://sources.redhat.com/jffs2/jffs2-licence.html
-
-
-       $Id: LICENCE,v 1.1 2002/05/20 14:56:37 dwmw2 Exp $

diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile
index 7f28ee0..c32b241 100644 (file)
--- a/fs/jffs2/Makefile
+++ b/fs/jffs2/Makefile
@@ -1,7 +1,6 @@
 #
 # Makefile for the Linux Journalling Flash File System v2 (JFFS2)
 #
-# $Id: Makefile.common,v 1.11 2005/09/07 08:34:53 havasi Exp $
 #
 
 obj-$(CONFIG_JFFS2_FS) += jffs2.o

diff --git a/fs/jffs2/README.Locking b/fs/jffs2/README.Locking
index c8f0bd6..d14d5a4 100644 (file)
--- a/fs/jffs2/README.Locking
+++ b/fs/jffs2/README.Locking
@@ -1,4 +1,3 @@
-       $Id: README.Locking,v 1.12 2005/04/13 13:22:35 dwmw2 Exp $
 
        JFFS2 LOCKING DOCUMENTATION
        ---------------------------

diff --cc fs/jffs2/TODO
Simple merge

diff --cc fs/jffs2/acl.c
Simple merge

diff --cc fs/jffs2/acl.h
Simple merge

diff --cc fs/jffs2/background.c
Simple merge

diff --cc fs/jffs2/build.c
Simple merge

diff --cc fs/jffs2/compr.c
Simple merge

diff --cc fs/jffs2/compr.h
Simple merge

diff --cc fs/jffs2/compr_rtime.c
Simple merge

diff --cc fs/jffs2/compr_rubin.c
Simple merge

diff --cc fs/jffs2/compr_rubin.h
Simple merge

diff --cc fs/jffs2/compr_zlib.c
Simple merge

diff --cc fs/jffs2/debug.c
Simple merge

diff --cc fs/jffs2/debug.h
Simple merge

diff --cc fs/jffs2/dir.c
Simple merge

diff --cc fs/jffs2/erase.c
Simple merge

diff --cc fs/jffs2/file.c
Simple merge

diff --cc fs/jffs2/fs.c
Simple merge

diff --cc fs/jffs2/gc.c
Simple merge

diff --cc fs/jffs2/ioctl.c
Simple merge

diff --cc fs/jffs2/jffs2_fs_i.h
Simple merge

diff --cc fs/jffs2/jffs2_fs_sb.h
Simple merge

diff --cc fs/jffs2/malloc.c
Simple merge

diff --cc fs/jffs2/nodelist.c
Simple merge

diff --cc fs/jffs2/nodelist.h
Simple merge

diff --cc fs/jffs2/nodemgmt.c
Simple merge

diff --cc fs/jffs2/os-linux.h
Simple merge

diff --cc fs/jffs2/pushpull.h
Simple merge

diff --cc fs/jffs2/read.c
Simple merge

diff --cc fs/jffs2/readinode.c
Simple merge

diff --cc fs/jffs2/scan.c
Simple merge

diff --cc fs/jffs2/security.c
Simple merge

diff --cc fs/jffs2/summary.c
Simple merge

diff --cc fs/jffs2/summary.h
Simple merge

diff --cc fs/jffs2/super.c
Simple merge

diff --cc fs/jffs2/symlink.c
Simple merge

diff --cc fs/jffs2/wbuf.c
Simple merge

diff --cc fs/jffs2/write.c
Simple merge

diff --cc fs/jffs2/writev.c
Simple merge

diff --cc fs/jffs2/xattr.c
Simple merge

diff --cc fs/jffs2/xattr.h
Simple merge

diff --cc fs/jffs2/xattr_trusted.c
Simple merge

diff --cc fs/jffs2/xattr_user.c
Simple merge