History

Merge 4.18-rc5 into usb-next

We need the USB fixes in here as well.

Greg Kroah-Hartman committed 8 years ago

Commit 500f0712 parents 4eb44f6 9d3cce1415 files · +3904 −2059Browse files

Showing the changes to scripts (11 of 415 files). Show all

Unified · Split

11 files
  1. scripts/Kbuild.include +1 −1
  2. scripts/Makefile.build +0 −3
  3. scripts/Makefile.clean +0 −3
  4. scripts/Makefile.modbuiltin +0 −4
  5. scripts/Makefile.modinst +0 −4
  6. scripts/Makefile.modpost +0 −4
  7. scripts/Makefile.modsign +0 −3
  8. scripts/cc-can-link.sh +1 −1
  9. scripts/checkpatch.pl +3 −3
  10. scripts/extract-vmlinux +2 −0
  11. scripts/tags.sh +1 −1
scripts/Kbuild.include+1−1
@@ -214,7 +214,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj · 213 unmodified lines
214# Prefix -I with $(srctree) if it is not an absolute path.214# Prefix -I with $(srctree) if it is not an absolute path.
215# skip if -I has no parameter215# skip if -I has no parameter
216addtree = $(if $(patsubst -I%,%,$(1)), \216addtree = $(if $(patsubst -I%,%,$(1)), \
217$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)))217$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)),$(1))
218 218
219# Find all -I options and call addtree219# Find all -I options and call addtree
220flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))220flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
scripts/Makefile.build+0−3
@@ -590,7 +590,4 @@ endif · 589 unmodified lines
590# We never want them to be removed automatically.590# We never want them to be removed automatically.
591.SECONDARY: $(targets)591.SECONDARY: $(targets)
592 592
593# Declare the contents of the .PHONY variable as phony. We keep that
594# information in a variable se we can use it in if_changed and friends.
595
596.PHONY: $(PHONY)593.PHONY: $(PHONY)
scripts/Makefile.clean+0−3
@@ -88,7 +88,4 @@ PHONY += $(subdir-ymn) · 87 unmodified lines
88$(subdir-ymn):88$(subdir-ymn):
89 $(Q)$(MAKE) $(clean)=$@89 $(Q)$(MAKE) $(clean)=$@
90 90
91# Declare the contents of the .PHONY variable as phony. We keep that
92# information in a variable se we can use it in if_changed and friends.
93
94.PHONY: $(PHONY)91.PHONY: $(PHONY)
scripts/Makefile.modbuiltin+0−4
@@ -54,8 +54,4 @@ PHONY += $(subdir-ym) · 53 unmodified lines
54$(subdir-ym):54$(subdir-ym):
55 $(Q)$(MAKE) $(modbuiltin)=$@55 $(Q)$(MAKE) $(modbuiltin)=$@
56 56
57
58# Declare the contents of the .PHONY variable as phony. We keep that
59# information in a variable se we can use it in if_changed and friends.
60
61.PHONY: $(PHONY)57.PHONY: $(PHONY)
scripts/Makefile.modinst+0−4
@@ -35,8 +35,4 @@ modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D)) · 34 unmodified lines
35$(modules):35$(modules):
36 $(call cmd,modules_install,$(MODLIB)/$(modinst_dir))36 $(call cmd,modules_install,$(MODLIB)/$(modinst_dir))
37 37
38
39# Declare the contents of the .PHONY variable as phony. We keep that
40# information in a variable so we can use it in if_changed and friends.
41
42.PHONY: $(PHONY)38.PHONY: $(PHONY)
scripts/Makefile.modpost+0−4
@@ -149,8 +149,4 @@ ifneq ($(cmd_files),) · 148 unmodified lines
149 include $(cmd_files)149 include $(cmd_files)
150endif150endif
151 151
152
153# Declare the contents of the .PHONY variable as phony. We keep that
154# information in a variable se we can use it in if_changed and friends.
155
156.PHONY: $(PHONY)152.PHONY: $(PHONY)
scripts/Makefile.modsign+0−3
@@ -27,7 +27,4 @@ modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D)) · 26 unmodified lines
27$(modules):27$(modules):
28 $(call cmd,sign_ko,$(MODLIB)/$(modinst_dir))28 $(call cmd,sign_ko,$(MODLIB)/$(modinst_dir))
29 29
30# Declare the contents of the .PHONY variable as phony. We keep that
31# information in a variable se we can use it in if_changed and friends.
32
33.PHONY: $(PHONY)30.PHONY: $(PHONY)
scripts/cc-can-link.sh+1−1
@@ -1,7 +1,7 @@
1#!/bin/sh1#!/bin/sh
2# SPDX-License-Identifier: GPL-2.02# SPDX-License-Identifier: GPL-2.0
3 3
4cat << "END" | $@ -x c - -o /dev/null >/dev/null 2>&1 && echo "y"4cat << "END" | $@ -x c - -o /dev/null >/dev/null 2>&1
5#include <stdio.h>5#include <stdio.h>
6int main(void)6int main(void)
7{7{
scripts/checkpatch.pl+3−3
@@ -5813,14 +5813,14 @@ sub process { · 5812 unmodified lines
5813 defined $stat &&5813 defined $stat &&
5814 $stat =~ /^\+(?![^\{]*\{\s*).*\b(\w+)\s*\(.*$String\s*,/s &&5814 $stat =~ /^\+(?![^\{]*\{\s*).*\b(\w+)\s*\(.*$String\s*,/s &&
5815 $1 !~ /^_*volatile_*$/) {5815 $1 !~ /^_*volatile_*$/) {
5816 my $specifier;
5817 my $extension;
5818 my $bad_specifier = "";
5819 my $stat_real;5816 my $stat_real;
5820 5817
5821 my $lc = $stat =~ tr@\n@@;5818 my $lc = $stat =~ tr@\n@@;
5822 $lc = $lc + $linenr;5819 $lc = $lc + $linenr;
5823 for (my $count = $linenr; $count <= $lc; $count++) {5820 for (my $count = $linenr; $count <= $lc; $count++) {
5821 my $specifier;
5822 my $extension;
5823 my $bad_specifier = "";
5824 my $fmt = get_quoted_string($lines[$count - 1], raw_line($count, 0));5824 my $fmt = get_quoted_string($lines[$count - 1], raw_line($count, 0));
5825 $fmt =~ s/%%//g;5825 $fmt =~ s/%%//g;
5826 5826
scripts/extract-vmlinux+2−0
@@ -57,6 +57,8 @@ try_decompress '\3757zXZ\000' abcde unxz · 56 unmodified lines
57try_decompress 'BZh' xy bunzip257try_decompress 'BZh' xy bunzip2
58try_decompress '\135\0\0\0' xxx unlzma58try_decompress '\135\0\0\0' xxx unlzma
59try_decompress '\211\114\132' xy 'lzop -d'59try_decompress '\211\114\132' xy 'lzop -d'
60try_decompress '\002!L\030' xxx 'lz4 -d'
61try_decompress '(\265/\375' xxx unzstd
60 62
61# Bail out:63# Bail out:
62echo "$me: Cannot find vmlinux." >&264echo "$me: Cannot find vmlinux." >&2
scripts/tags.sh+1−1
@@ -245,7 +245,7 @@ exuberant() · 244 unmodified lines
245{245{
246 setup_regex exuberant asm c246 setup_regex exuberant asm c
247 all_target_sources | xargs $1 -a \247 all_target_sources | xargs $1 -a \
248 -I __initdata,__exitdata,__initconst, \248 -I __initdata,__exitdata,__initconst,__ro_after_init \
249 -I __initdata_memblock \249 -I __initdata_memblock \
250 -I __refdata,__attribute,__maybe_unused,__always_unused \250 -I __refdata,__attribute,__maybe_unused,__always_unused \
251 -I __acquires,__releases,__deprecated \251 -I __acquires,__releases,__deprecated \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t