Merge drm-fixes-for-v4.17-rc6-urgent into drm-next
Need to backmerge some nouveau fixes to reduce the nouveau -next conflicts a lot. Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
@@ -14,7 +14,7 @@ ifdef CONFIG_GCC_PLUGINS
|
||||
endif
|
||||
|
||||
ifdef CONFIG_GCC_PLUGIN_SANCOV
|
||||
ifeq ($(CFLAGS_KCOV),)
|
||||
ifeq ($(strip $(CFLAGS_KCOV)),)
|
||||
# It is needed because of the gcc-plugin.sh and gcc version checks.
|
||||
gcc-plugin-$(CONFIG_GCC_PLUGIN_SANCOV) += sancov_plugin.so
|
||||
|
||||
|
||||
@@ -196,7 +196,7 @@ $(obj)/%.tab.c: $(src)/%.y FORCE
|
||||
$(call if_changed,bison)
|
||||
|
||||
quiet_cmd_bison_h = YACC $@
|
||||
cmd_bison_h = bison -o/dev/null --defines=$@ -t -l $<
|
||||
cmd_bison_h = $(YACC) -o/dev/null --defines=$@ -t -l $<
|
||||
|
||||
$(obj)/%.tab.h: $(src)/%.y FORCE
|
||||
$(call if_changed,bison_h)
|
||||
|
||||
@@ -787,10 +787,9 @@ static void check_pci_bridge(struct check *c, struct dt_info *dti, struct node *
|
||||
FAIL(c, dti, node, "incorrect #size-cells for PCI bridge");
|
||||
|
||||
prop = get_property(node, "bus-range");
|
||||
if (!prop) {
|
||||
FAIL(c, dti, node, "missing bus-range for PCI bridge");
|
||||
if (!prop)
|
||||
return;
|
||||
}
|
||||
|
||||
if (prop->val.len != (sizeof(cell_t) * 2)) {
|
||||
FAIL_PROP(c, dti, node, prop, "value must be 2 cells");
|
||||
return;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
# Copyright (c) Mauro Carvalho Chehab <mchehab@infradead.org>
|
||||
# Copyright (c) Mauro Carvalho Chehab <mchehab@kernel.org>
|
||||
# Released under GPLv2
|
||||
#
|
||||
# In order to use, you need to:
|
||||
|
||||
+4
-1
@@ -170,7 +170,10 @@ __faddr2line() {
|
||||
echo "$file_lines" | while read -r line
|
||||
do
|
||||
echo $line
|
||||
eval $(echo $line | awk -F "[ :]" '{printf("n1=%d;n2=%d;f=%s",$NF-5, $NF+5, $(NF-1))}')
|
||||
n=$(echo $line | sed 's/.*:\([0-9]\+\).*/\1/g')
|
||||
n1=$[$n-5]
|
||||
n2=$[$n+5]
|
||||
f=$(echo $line | sed 's/.*at \(.\+\):.*/\1/g')
|
||||
awk 'NR>=strtonum("'$n1'") && NR<=strtonum("'$n2'") {printf("%d\t%s\n", NR, $0)}' $f
|
||||
done
|
||||
|
||||
|
||||
@@ -14,14 +14,14 @@ genksyms-objs := genksyms.o parse.tab.o lex.lex.o
|
||||
# so that 'bison: not found' will be displayed if it is missing.
|
||||
ifeq ($(findstring 1,$(KBUILD_ENABLE_EXTRA_GCC_CHECKS)),)
|
||||
|
||||
quiet_cmd_bison_no_warn = $(quet_cmd_bison)
|
||||
quiet_cmd_bison_no_warn = $(quiet_cmd_bison)
|
||||
cmd_bison_no_warn = $(YACC) --version >/dev/null; \
|
||||
$(cmd_bison) 2>/dev/null
|
||||
|
||||
$(obj)/parse.tab.c: $(src)/parse.y FORCE
|
||||
$(call if_changed,bison_no_warn)
|
||||
|
||||
quiet_cmd_bison_h_no_warn = $(quet_cmd_bison_h)
|
||||
quiet_cmd_bison_h_no_warn = $(quiet_cmd_bison_h)
|
||||
cmd_bison_h_no_warn = $(YACC) --version >/dev/null; \
|
||||
$(cmd_bison_h) 2>/dev/null
|
||||
|
||||
|
||||
@@ -330,14 +330,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* There will be a line like so:
|
||||
deps_drivers/net/dummy.o := \
|
||||
drivers/net/dummy.c \
|
||||
$(wildcard include/config/net/fastroute.h) \
|
||||
include/linux/module.h \
|
||||
|
||||
Sum all files in the same dir or subdirs.
|
||||
*/
|
||||
/* Sum all files in the same dir or subdirs. */
|
||||
while ((line = get_next_line(&pos, file, flen)) != NULL) {
|
||||
char* p = line;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/perl
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# Author: Mauro Carvalho Chehab <mchehab@s-opensource.com>
|
||||
# Author: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
|
||||
#
|
||||
# Produce manpages from kernel-doc.
|
||||
# See Documentation/doc-guide/kernel-doc.rst for instructions
|
||||
|
||||
Reference in New Issue
Block a user