diff options
| author | Daniel Vetter | 2014-03-31 10:40:13 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-03-31 10:45:15 +0200 |
| commit | 0654a65f26d4b226c0b3e8a050db100200a6b924 (patch) | |
| tree | 7b448b84cdc7ec0bbbd1ad6e9500eef94af0bfe8 /Documentation | |
| parent | drm/i915/tv: fix gen4 composite s-video tv-out (diff) | |
| parent | Linux 3.14 (diff) | |
| download | kernel-qcow2-linux-0654a65f26d4b226c0b3e8a050db100200a6b924.tar.gz kernel-qcow2-linux-0654a65f26d4b226c0b3e8a050db100200a6b924.tar.xz kernel-qcow2-linux-0654a65f26d4b226c0b3e8a050db100200a6b924.zip | |
Merge tag 'v3.14' into drm-intel-next-queued
Linux 3.14
The vt-d w/a merged late in 3.14-rc needs a bit of fine-tuning, hence
backmerge.
Conflicts:
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_dp.c
All trivial adjacent lines changed type conflicts, so trivial git
doesn't even show them in the merg commit.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/micrel-ks8851.txt | 1 | ||||
| -rw-r--r-- | Documentation/networking/netlink_mmap.txt | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/net/micrel-ks8851.txt b/Documentation/devicetree/bindings/net/micrel-ks8851.txt index 11ace3c3d805..4fc392763611 100644 --- a/Documentation/devicetree/bindings/net/micrel-ks8851.txt +++ b/Documentation/devicetree/bindings/net/micrel-ks8851.txt @@ -7,3 +7,4 @@ Required properties: Optional properties: - local-mac-address : Ethernet mac address to use +- vdd-supply: supply for Ethernet mac diff --git a/Documentation/networking/netlink_mmap.txt b/Documentation/networking/netlink_mmap.txt index b26122973525..c6af4bac5aa8 100644 --- a/Documentation/networking/netlink_mmap.txt +++ b/Documentation/networking/netlink_mmap.txt @@ -226,9 +226,9 @@ Ring setup: void *rx_ring, *tx_ring; /* Configure ring parameters */ - if (setsockopt(fd, NETLINK_RX_RING, &req, sizeof(req)) < 0) + if (setsockopt(fd, SOL_NETLINK, NETLINK_RX_RING, &req, sizeof(req)) < 0) exit(1); - if (setsockopt(fd, NETLINK_TX_RING, &req, sizeof(req)) < 0) + if (setsockopt(fd, SOL_NETLINK, NETLINK_TX_RING, &req, sizeof(req)) < 0) exit(1) /* Calculate size of each individual ring */ |