diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2023-08-07 13:29:40 +0300 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2023-08-07 13:29:40 +0300 |
| commit | 9f771739a04919226081a107167596de75108fbb (patch) | |
| tree | fd64841d76f3408ed5d25f4d9aaa5088a752e2fd /scripts/basic | |
| parent | 28e671114fb0f28f334fac8d0a6b9c395c7b0498 (diff) | |
| parent | d9aa1da9a8cfb0387eb5703c15bd1f54421460ac (diff) | |
| download | linux-9f771739a04919226081a107167596de75108fbb.tar.gz linux-9f771739a04919226081a107167596de75108fbb.tar.bz2 linux-9f771739a04919226081a107167596de75108fbb.zip | |
Merge drm/drm-next into drm-intel-gt-next
Need to pull in b3e4aae612ec ("drm/i915/hdcp: Modify hdcp_gsc_message msg sending mechanism") as
a dependency for https://patchwork.freedesktop.org/series/121735/
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'scripts/basic')
| -rw-r--r-- | scripts/basic/fixdep.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index fa562806c2be..84b6efa849f4 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -246,8 +246,7 @@ static void *read_file(const char *filename) /* Ignore certain dependencies */ static int is_ignored_file(const char *s, int len) { - return str_ends_with(s, len, "include/generated/autoconf.h") || - str_ends_with(s, len, "include/generated/autoksyms.h"); + return str_ends_with(s, len, "include/generated/autoconf.h"); } /* Do not parse these files */ |