* [PATCH 2/5] kernel: Remove reference to feature-removal-schedule.txt.
2012-11-08 13:50 ` [PATCH 1/5] Documentation: Remove reference to feature-removal-schedule.txt Tao Ma
@ 2012-11-08 13:50 ` Tao Ma
2012-11-08 13:50 ` [PATCH 3/5] checkpatch: " Tao Ma
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Tao Ma @ 2012-11-08 13:50 UTC (permalink / raw)
To: linux-kernel; +Cc: Andrew Morton, Linus Torvalds
From: Tao Ma <boyu.mt@taobao.com>
In 9c0ece069, Linus removed feature-removal-schedule.txt from Documentation,
but there is still some reference to this file. So remove them.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
kernel/cgroup.c | 1 -
kernel/module.c | 3 ---
2 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index f24f724..46cfd4c 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1381,7 +1381,6 @@ static int cgroup_remount(struct super_block *sb, int *flags, char *data)
if (ret)
goto out_unlock;
- /* See feature-removal-schedule.txt */
if (opts.subsys_mask != root->actual_subsys_mask || opts.release_agent)
pr_warning("cgroup: option changes via remount are deprecated (pid=%d comm=%s)\n",
task_tgid_nr(current), current->comm);
diff --git a/kernel/module.c b/kernel/module.c
index 6085f5e..b4e3f0c 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -372,9 +372,6 @@ static bool check_symbol(const struct symsearch *syms,
printk(KERN_WARNING "Symbol %s is being used "
"by a non-GPL module, which will not "
"be allowed in the future\n", fsa->name);
- printk(KERN_WARNING "Please see the file "
- "Documentation/feature-removal-schedule.txt "
- "in the kernel source tree for more details.\n");
}
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/5] checkpatch: Remove reference to feature-removal-schedule.txt.
2012-11-08 13:50 ` [PATCH 1/5] Documentation: Remove reference to feature-removal-schedule.txt Tao Ma
2012-11-08 13:50 ` [PATCH 2/5] kernel: " Tao Ma
@ 2012-11-08 13:50 ` Tao Ma
2012-11-08 17:47 ` Andy Whitcroft
2012-11-08 13:50 ` [PATCH 4/5] sound: " Tao Ma
2012-11-08 13:50 ` [PATCH 5/5] drivers: " Tao Ma
3 siblings, 1 reply; 9+ messages in thread
From: Tao Ma @ 2012-11-08 13:50 UTC (permalink / raw)
To: linux-kernel; +Cc: Andrew Morton, Andy Whitcroft, Linus Torvalds
From: Tao Ma <boyu.mt@taobao.com>
In 9c0ece069, Linus removed feature-removal-schedule.txt from Documentation,
but there is still some reference to this file. So remove them.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Whitcroft <apw@canonical.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
scripts/checkpatch.pl | 44 --------------------------------------------
1 files changed, 0 insertions(+), 44 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 21a9f5d..b0240b8 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -352,27 +352,6 @@ sub deparenthesize {
$chk_signoff = 0 if ($file);
-my @dep_includes = ();
-my @dep_functions = ();
-my $removal = "Documentation/feature-removal-schedule.txt";
-if ($tree && -f "$root/$removal") {
- open(my $REMOVE, '<', "$root/$removal") ||
- die "$P: $removal: open failed - $!\n";
- while (<$REMOVE>) {
- if (/^Check:\s+(.*\S)/) {
- for my $entry (split(/[, ]+/, $1)) {
- if ($entry =~ m@include/(.*)@) {
- push(@dep_includes, $1);
-
- } elsif ($entry !~ m@/@) {
- push(@dep_functions, $entry);
- }
- }
- }
- }
- close($REMOVE);
-}
-
my @rawlines = ();
my @lines = ();
my $vname;
@@ -3181,29 +3160,6 @@ sub process {
}
}
-# don't include deprecated include files (uses RAW line)
- for my $inc (@dep_includes) {
- if ($rawline =~ m@^.\s*\#\s*include\s*\<$inc>@) {
- ERROR("DEPRECATED_INCLUDE",
- "Don't use <$inc>: see Documentation/feature-removal-schedule.txt\n" . $herecurr);
- }
- }
-
-# don't use deprecated functions
- for my $func (@dep_functions) {
- if ($line =~ /\b$func\b/) {
- ERROR("DEPRECATED_FUNCTION",
- "Don't use $func(): see Documentation/feature-removal-schedule.txt\n" . $herecurr);
- }
- }
-
-# no volatiles please
- my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b};
- if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) {
- WARN("VOLATILE",
- "Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);
- }
-
# warn about #if 0
if ($line =~ /^.\s*\#\s*if\s+0\b/) {
CHK("REDUNDANT_CODE",
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 3/5] checkpatch: Remove reference to feature-removal-schedule.txt.
2012-11-08 13:50 ` [PATCH 3/5] checkpatch: " Tao Ma
@ 2012-11-08 17:47 ` Andy Whitcroft
2012-11-09 1:38 ` [PATCH V2 " Tao Ma
0 siblings, 1 reply; 9+ messages in thread
From: Andy Whitcroft @ 2012-11-08 17:47 UTC (permalink / raw)
To: Tao Ma; +Cc: linux-kernel, Andrew Morton, Linus Torvalds
On Thu, Nov 08, 2012 at 09:50:33PM +0800, Tao Ma wrote:
> From: Tao Ma <boyu.mt@taobao.com>
>
> In 9c0ece069, Linus removed feature-removal-schedule.txt from Documentation,
> but there is still some reference to this file. So remove them.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Andy Whitcroft <apw@canonical.com>
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
> Signed-off-by: Tao Ma <boyu.mt@taobao.com>
> ---
> scripts/checkpatch.pl | 44 --------------------------------------------
> 1 files changed, 0 insertions(+), 44 deletions(-)
>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 21a9f5d..b0240b8 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -352,27 +352,6 @@ sub deparenthesize {
>
> $chk_signoff = 0 if ($file);
>
> -my @dep_includes = ();
> -my @dep_functions = ();
> -my $removal = "Documentation/feature-removal-schedule.txt";
> -if ($tree && -f "$root/$removal") {
> - open(my $REMOVE, '<', "$root/$removal") ||
> - die "$P: $removal: open failed - $!\n";
> - while (<$REMOVE>) {
> - if (/^Check:\s+(.*\S)/) {
> - for my $entry (split(/[, ]+/, $1)) {
> - if ($entry =~ m@include/(.*)@) {
> - push(@dep_includes, $1);
> -
> - } elsif ($entry !~ m@/@) {
> - push(@dep_functions, $entry);
> - }
> - }
> - }
> - }
> - close($REMOVE);
> -}
> -
> my @rawlines = ();
> my @lines = ();
> my $vname;
> @@ -3181,29 +3160,6 @@ sub process {
> }
> }
>
> -# don't include deprecated include files (uses RAW line)
> - for my $inc (@dep_includes) {
> - if ($rawline =~ m@^.\s*\#\s*include\s*\<$inc>@) {
> - ERROR("DEPRECATED_INCLUDE",
> - "Don't use <$inc>: see Documentation/feature-removal-schedule.txt\n" . $herecurr);
> - }
> - }
> -
> -# don't use deprecated functions
> - for my $func (@dep_functions) {
> - if ($line =~ /\b$func\b/) {
> - ERROR("DEPRECATED_FUNCTION",
> - "Don't use $func(): see Documentation/feature-removal-schedule.txt\n" . $herecurr);
> - }
> - }
> -
> -# no volatiles please
> - my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b};
> - if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) {
> - WARN("VOLATILE",
> - "Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);
> - }
> -
This last bit here looks to be an accidental extra deletiong ? I don't
think this relates to the patch at hand.
> # warn about #if 0
> if ($line =~ /^.\s*\#\s*if\s+0\b/) {
> CHK("REDUNDANT_CODE",
-apw
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH V2 3/5] checkpatch: Remove reference to feature-removal-schedule.txt.
2012-11-08 17:47 ` Andy Whitcroft
@ 2012-11-09 1:38 ` Tao Ma
2012-11-09 9:55 ` [Acked] " Andy Whitcroft
0 siblings, 1 reply; 9+ messages in thread
From: Tao Ma @ 2012-11-09 1:38 UTC (permalink / raw)
To: linux-kernel; +Cc: Andrew Morton, Andy Whitcroft
From: Tao Ma <boyu.mt@taobao.com>
In 9c0ece069, Linus removes feature-removal-schedule.txt from Documentation,
but there is still some reference to this file. So remove them.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
scripts/checkpatch.pl | 37 -------------------------------------
1 files changed, 0 insertions(+), 37 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 21a9f5d..b56c5e0 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -352,27 +352,6 @@ sub deparenthesize {
$chk_signoff = 0 if ($file);
-my @dep_includes = ();
-my @dep_functions = ();
-my $removal = "Documentation/feature-removal-schedule.txt";
-if ($tree && -f "$root/$removal") {
- open(my $REMOVE, '<', "$root/$removal") ||
- die "$P: $removal: open failed - $!\n";
- while (<$REMOVE>) {
- if (/^Check:\s+(.*\S)/) {
- for my $entry (split(/[, ]+/, $1)) {
- if ($entry =~ m@include/(.*)@) {
- push(@dep_includes, $1);
-
- } elsif ($entry !~ m@/@) {
- push(@dep_functions, $entry);
- }
- }
- }
- }
- close($REMOVE);
-}
-
my @rawlines = ();
my @lines = ();
my $vname;
@@ -3181,22 +3160,6 @@ sub process {
}
}
-# don't include deprecated include files (uses RAW line)
- for my $inc (@dep_includes) {
- if ($rawline =~ m@^.\s*\#\s*include\s*\<$inc>@) {
- ERROR("DEPRECATED_INCLUDE",
- "Don't use <$inc>: see Documentation/feature-removal-schedule.txt\n" . $herecurr);
- }
- }
-
-# don't use deprecated functions
- for my $func (@dep_functions) {
- if ($line =~ /\b$func\b/) {
- ERROR("DEPRECATED_FUNCTION",
- "Don't use $func(): see Documentation/feature-removal-schedule.txt\n" . $herecurr);
- }
- }
-
# no volatiles please
my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b};
if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Acked] [PATCH V2 3/5] checkpatch: Remove reference to feature-removal-schedule.txt.
2012-11-09 1:38 ` [PATCH V2 " Tao Ma
@ 2012-11-09 9:55 ` Andy Whitcroft
0 siblings, 0 replies; 9+ messages in thread
From: Andy Whitcroft @ 2012-11-09 9:55 UTC (permalink / raw)
To: Tao Ma; +Cc: linux-kernel, Andrew Morton
On Fri, Nov 09, 2012 at 09:38:12AM +0800, Tao Ma wrote:
> From: Tao Ma <boyu.mt@taobao.com>
>
> In 9c0ece069, Linus removes feature-removal-schedule.txt from Documentation,
> but there is still some reference to this file. So remove them.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Andy Whitcroft <apw@canonical.com>
> Signed-off-by: Tao Ma <boyu.mt@taobao.com>
> ---
> scripts/checkpatch.pl | 37 -------------------------------------
> 1 files changed, 0 insertions(+), 37 deletions(-)
>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 21a9f5d..b56c5e0 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -352,27 +352,6 @@ sub deparenthesize {
>
> $chk_signoff = 0 if ($file);
>
> -my @dep_includes = ();
> -my @dep_functions = ();
> -my $removal = "Documentation/feature-removal-schedule.txt";
> -if ($tree && -f "$root/$removal") {
> - open(my $REMOVE, '<', "$root/$removal") ||
> - die "$P: $removal: open failed - $!\n";
> - while (<$REMOVE>) {
> - if (/^Check:\s+(.*\S)/) {
> - for my $entry (split(/[, ]+/, $1)) {
> - if ($entry =~ m@include/(.*)@) {
> - push(@dep_includes, $1);
> -
> - } elsif ($entry !~ m@/@) {
> - push(@dep_functions, $entry);
> - }
> - }
> - }
> - }
> - close($REMOVE);
> -}
> -
> my @rawlines = ();
> my @lines = ();
> my $vname;
> @@ -3181,22 +3160,6 @@ sub process {
> }
> }
>
> -# don't include deprecated include files (uses RAW line)
> - for my $inc (@dep_includes) {
> - if ($rawline =~ m@^.\s*\#\s*include\s*\<$inc>@) {
> - ERROR("DEPRECATED_INCLUDE",
> - "Don't use <$inc>: see Documentation/feature-removal-schedule.txt\n" . $herecurr);
> - }
> - }
> -
> -# don't use deprecated functions
> - for my $func (@dep_functions) {
> - if ($line =~ /\b$func\b/) {
> - ERROR("DEPRECATED_FUNCTION",
> - "Don't use $func(): see Documentation/feature-removal-schedule.txt\n" . $herecurr);
> - }
> - }
> -
> # no volatiles please
> my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b};
> if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) {
> --
> 1.7.0.4
>
Looks sane and cirtainly if the file is gone we are gaining nothing with
this code.
Acked-by: Andy Whitcroft <apw@canonical.com>
-apw
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 4/5] sound: Remove reference to feature-removal-schedule.txt.
2012-11-08 13:50 ` [PATCH 1/5] Documentation: Remove reference to feature-removal-schedule.txt Tao Ma
2012-11-08 13:50 ` [PATCH 2/5] kernel: " Tao Ma
2012-11-08 13:50 ` [PATCH 3/5] checkpatch: " Tao Ma
@ 2012-11-08 13:50 ` Tao Ma
2012-11-08 13:50 ` [PATCH 5/5] drivers: " Tao Ma
3 siblings, 0 replies; 9+ messages in thread
From: Tao Ma @ 2012-11-08 13:50 UTC (permalink / raw)
To: linux-kernel; +Cc: Andrew Morton, Takashi Iwai, Linus Torvalds
From: Tao Ma <boyu.mt@taobao.com>
In 9c0ece069, Linus removed feature-removal-schedule.txt from Documentation,
but there is still some reference to this file. So remove them.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
sound/Kconfig | 3 ---
sound/sound_core.c | 3 +--
2 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/sound/Kconfig b/sound/Kconfig
index 261a03c..c710ce2 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -52,9 +52,6 @@ config SOUND_OSS_CORE_PRECLAIM
Disabling this allows alternative OSS implementations.
- Please read Documentation/feature-removal-schedule.txt for
- details.
-
If unsure, say Y.
source "sound/oss/dmasound/Kconfig"
diff --git a/sound/sound_core.c b/sound/sound_core.c
index fb9255c..bb23009 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -146,8 +146,7 @@ extern int msnd_pinnacle_init(void);
* devices only the standard chrdev aliases are requested.
*
* All these clutters are scheduled to be removed along with
- * sound-slot/service-* module aliases. Please take a look at
- * feature-removal-schedule.txt for details.
+ * sound-slot/service-* module aliases.
*/
#ifdef CONFIG_SOUND_OSS_CORE_PRECLAIM
static int preclaim_oss = 1;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/5] drivers: Remove reference to feature-removal-schedule.txt.
2012-11-08 13:50 ` [PATCH 1/5] Documentation: Remove reference to feature-removal-schedule.txt Tao Ma
` (2 preceding siblings ...)
2012-11-08 13:50 ` [PATCH 4/5] sound: " Tao Ma
@ 2012-11-08 13:50 ` Tao Ma
3 siblings, 0 replies; 9+ messages in thread
From: Tao Ma @ 2012-11-08 13:50 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, Andrew Morton, Linus Torvalds
From: Tao Ma <boyu.mt@taobao.com>
In 9c0ece069, Linus removed feature-removal-schedule.txt from Documentation,
but there is still some reference to this file. So remove them.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
---
drivers/mmc/host/Kconfig | 4 +---
drivers/net/wireless/Kconfig | 6 +-----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 9bf10e7..82fc4c8 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -282,9 +282,7 @@ config MMC_AT91
depends on ARCH_AT91
help
This selects the AT91 MCI controller. This driver will
- be removed soon (for more information have a look to
- Documentation/feature-removal-schedule.txt). Please use
- MMC_ATMEL_MCI.
+ be removed soon. Please use MMC_ATMEL_MCI.
If unsure, say N.
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 6deaae1..28aa05f 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -156,11 +156,7 @@ config PRISM54
---help---
This enables support for FullMAC PCI/Cardbus prism54 devices. This
driver is now deprecated in favor for the SoftMAC driver, p54pci.
- p54pci supports FullMAC PCI/Cardbus devices as well. For details on
- the scheduled removal of this driver on the kernel see the feature
- removal schedule:
-
- Documentation/feature-removal-schedule.txt
+ p54pci supports FullMAC PCI/Cardbus devices as well.
For more information refer to the p54 wiki:
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread