Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b563ea67 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'linus' into timers/2038

Merge upstream to pick up changes on which pending patches depend on.
parents 4fe581d7 73fcb1a3
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -244,3 +244,11 @@ Description: read only
                Returns 1 if the psl timebase register is synchronized
                with the core timebase register, 0 otherwise.
Users:          https://github.com/ibm-capi/libcxl

What:           /sys/class/cxl/<card>/tunneled_ops_supported
Date:           May 2018
Contact:        linuxppc-dev@lists.ozlabs.org
Description:    read only
                Returns 1 if tunneled operations are supported in capi mode,
                0 otherwise.
Users:          https://github.com/ibm-capi/libcxl
+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ feature enabled.]

In this mode ``intel_pstate`` registers utilization update callbacks with the
CPU scheduler in order to run a P-state selection algorithm, either
``powersave`` or ``performance``, depending on the ``scaling_cur_freq`` policy
``powersave`` or ``performance``, depending on the ``scaling_governor`` policy
setting in ``sysfs``.  The current CPU frequency information to be made
available from the ``scaling_cur_freq`` policy attribute in ``sysfs`` is
periodically updated by those utilization update callbacks too.
+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Sleep States That Can Be Supported
==================================

Depending on its configuration and the capabilities of the platform it runs on,
the Linux kernel can support up to four system sleep states, includig
the Linux kernel can support up to four system sleep states, including
hibernation and up to three variants of system suspend.  The sleep states that
can be supported by the kernel are listed below.

+9 −1
Original line number Diff line number Diff line
@@ -557,6 +557,14 @@ A: Although LLVM IR generation and optimization try to stay architecture
       pulls in some header files containing file scope host assembly codes.
     - You can add "-fno-jump-tables" to work around the switch table issue.

   Otherwise, you can use bpf target.
   Otherwise, you can use bpf target. Additionally, you _must_ use bpf target
   when:

     - Your program uses data structures with pointer or long / unsigned long
       types that interface with BPF helpers or context data structures. Access
       into these structures is verified by the BPF verifier and may result
       in verification failures if the native architecture is not aligned with
       the BPF architecture, e.g. 64-bit. An example of this is
       BPF_PROG_TYPE_SK_MSG require '-target bpf'

Happy BPF hacking!
+13 −0
Original line number Diff line number Diff line
@@ -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
---------

Loading