Skip to content

Commit fde6af4

Browse files
davem330davem330
committed
Merge tag 'mlx5-shared-2017-08-07' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Saeed Mahameed says: ==================== mlx5-shared-2017-08-07 This series includes some mlx5 updates for both net-next and rdma trees. From Saeed, Core driver updates to allow selectively building the driver with or without some large driver components, such as - E-Switch (Ethernet SRIOV support). - Multi-Physical Function Switch (MPFs) support. For that we split E-Switch and MPFs functionalities into separate files. From Erez, Delay mlx5_core events when mlx5 interfaces, namely mlx5_ib, registration is taking place and until it completes. From Rabie, Increase the maximum supported flow counters. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 71feeef + a8ffcc7 commit fde6af4

File tree

333 files changed

+7477
-15440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

333 files changed

+7477
-15440
lines changed

‎Documentation/admin-guide/pm/cpufreq.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,14 @@ are the following:
237237
This attribute is not present if the scaling driver in use does not
238238
support it.
239239

240+
``cpuinfo_cur_freq``
241+
Current frequency of the CPUs belonging to this policy as obtained from
242+
the hardware (in KHz).
243+
244+
This is expected to be the frequency the hardware actually runs at.
245+
If that frequency cannot be determined, this attribute should not
246+
be present.
247+
240248
``cpuinfo_max_freq``
241249
Maximum possible operating frequency the CPUs belonging to this policy
242250
can run at (in kHz).

‎Documentation/devicetree/bindings/gpio/gpio-exar.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Exportable MPIO interface of Exar UART chips
2+
3+
Required properties of the device:
4+
- exar,first-pin: first exportable pins (0..15)
5+
- ngpios: number of exportable pins (1..16)

‎Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Optional properties:
4040
Example for a Mali-T760:
4141

4242
gpu@ffa30000 {
43-
compatible = "rockchip,rk3288-mali", "arm,mali-t760", "arm,mali-midgard";
43+
compatible = "rockchip,rk3288-mali", "arm,mali-t760";
4444
reg = <0xffa30000 0x10000>;
4545
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
4646
<GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

0 commit comments

Comments
 (0)