Merge tag '4.4-fix' of git://git.lwn.net/linux

116dfe5e · Linus Torvalds <[email protected]> · 2015-11-20 15:47:27 -08:00

Pull documentation fix from Jon Corbet:
 "A single fix from Mauro for a 4.4 regression that would cause the docs
  build to fail on systems with ancient Perl installations"

* tag '4.4-fix' of git://git.lwn.net/linux:
  kernel-doc: Make it compatible with Perl versions below 5.12 again

Commit: 116dfe5e88cd0c9368bf0db28708fff6b549951f
Parents: 95803066 · 1ef06233

Merge commit. Changes below are compared with the first parent: 95803066.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
scripts/kernel-doc	modified	+1	−1	View file

scripts/kernel-doc

View file

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 125b906..638a38e 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -2711,7 +2711,7 @@ $kernelversion = get_kernel_version();
 
 # generate a sequence of code that will splice in highlighting information
 # using the s// operator.
-foreach my $k (keys @highlights) {
+for (my $k = 0; $k < @highlights; $k++) {
     my $pattern = $highlights[$k][0];
     my $result = $highlights[$k][1];
 #   print STDERR "scanning pattern:$pattern, highlight:($result)\n";