diff options
author | Sean Paul <seanpaul@chromium.org> | 2019-10-23 17:14:11 +0200 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2019-10-23 17:14:11 +0200 |
commit | 44bf67f32a6803339ac1ba721b158c3e2272cabe (patch) | |
tree | 1ed93503a4a1d20005b85df91bd81e5f5982f348 /lib/textsearch.c | |
parent | Revert "drm/omap: add OMAP_BO flags to affect buffer allocation" (diff) | |
parent | Merge v5.4-rc4 into drm-next (diff) | |
download | linux-44bf67f32a6803339ac1ba721b158c3e2272cabe.tar.xz linux-44bf67f32a6803339ac1ba721b158c3e2272cabe.zip |
Merge drm/drm-next into drm-misc-next
Parroting Daniel's backmerge justification from
2e79e22e092acd55da0b2db066e4826d7d152c41:
Thierry needs fd70c7755bf0 ("drm/bridge: tc358767: fix max_tu_symbol
value") to be able to merge his dp_link patch series.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'lib/textsearch.c')
-rw-r--r-- | lib/textsearch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/textsearch.c b/lib/textsearch.c index 4f16eec5d554..f68dea8806be 100644 --- a/lib/textsearch.c +++ b/lib/textsearch.c @@ -89,9 +89,9 @@ * goto errout; * } * - * pos = textsearch_find_continuous(conf, \&state, example, strlen(example)); + * pos = textsearch_find_continuous(conf, &state, example, strlen(example)); * if (pos != UINT_MAX) - * panic("Oh my god, dancing chickens at \%d\n", pos); + * panic("Oh my god, dancing chickens at %d\n", pos); * * textsearch_destroy(conf); */ |