diff options
author | 2018-04-25 10:41:08 +0200 | |
---|---|---|
committer | 2018-04-25 16:44:36 +0200 | |
commit | 4d31c6e41ed2f95f97a19766812797dabd82a5ee (patch) | |
tree | e1f81f4f0108ff86f85b8e17b025b21609aec7b2 /Documentation/core-api/kernel-api.rst | |
parent | ALSA: hda - Sanity check of access to SPDIF controls array (diff) | |
parent | ALSA: hda - Skip jack and others for non-existing PCM streams (diff) | |
download | linux-4d31c6e41ed2f95f97a19766812797dabd82a5ee.tar.gz linux-4d31c6e41ed2f95f97a19766812797dabd82a5ee.tar.bz2 linux-4d31c6e41ed2f95f97a19766812797dabd82a5ee.zip |
Merge branch 'for-linus' into for-next
Back-merge 4.17-rc3 fixes for further development.
This will bump the base to 4.17-rc2, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Documentation/core-api/kernel-api.rst')
-rw-r--r-- | Documentation/core-api/kernel-api.rst | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/core-api/kernel-api.rst b/Documentation/core-api/kernel-api.rst index ff335f8aeb39..92f30006adae 100644 --- a/Documentation/core-api/kernel-api.rst +++ b/Documentation/core-api/kernel-api.rst @@ -136,6 +136,19 @@ Sorting .. kernel-doc:: lib/list_sort.c :export: +Text Searching +-------------- + +.. kernel-doc:: lib/textsearch.c + :doc: ts_intro + +.. kernel-doc:: lib/textsearch.c + :export: + +.. kernel-doc:: include/linux/textsearch.h + :functions: textsearch_find textsearch_next \ + textsearch_get_pattern textsearch_get_pattern_len + UUID/GUID --------- |