Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kirill Smelkov
linux
Commits
bf5f4833
Commit
bf5f4833
authored
11 years ago
by
Johannes Berg
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
parents
d85dad75
35582ad9
Changes
1000
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
113 additions
and
28 deletions
+113
-28
CREDITS
CREDITS
+2
-2
Documentation/ABI/testing/configfs-usb-gadget
Documentation/ABI/testing/configfs-usb-gadget
+6
-6
Documentation/ABI/testing/configfs-usb-gadget-acm
Documentation/ABI/testing/configfs-usb-gadget-acm
+1
-1
Documentation/ABI/testing/configfs-usb-gadget-ecm
Documentation/ABI/testing/configfs-usb-gadget-ecm
+1
-1
Documentation/ABI/testing/configfs-usb-gadget-eem
Documentation/ABI/testing/configfs-usb-gadget-eem
+1
-1
Documentation/ABI/testing/configfs-usb-gadget-ffs
Documentation/ABI/testing/configfs-usb-gadget-ffs
+1
-1
Documentation/ABI/testing/configfs-usb-gadget-loopback
Documentation/ABI/testing/configfs-usb-gadget-loopback
+1
-1
Documentation/ABI/testing/configfs-usb-gadget-mass-storage
Documentation/ABI/testing/configfs-usb-gadget-mass-storage
+2
-2
Documentation/ABI/testing/configfs-usb-gadget-ncm
Documentation/ABI/testing/configfs-usb-gadget-ncm
+1
-1
Documentation/ABI/testing/configfs-usb-gadget-obex
Documentation/ABI/testing/configfs-usb-gadget-obex
+1
-1
Documentation/ABI/testing/configfs-usb-gadget-phonet
Documentation/ABI/testing/configfs-usb-gadget-phonet
+1
-1
Documentation/ABI/testing/configfs-usb-gadget-rndis
Documentation/ABI/testing/configfs-usb-gadget-rndis
+1
-1
Documentation/ABI/testing/configfs-usb-gadget-serial
Documentation/ABI/testing/configfs-usb-gadget-serial
+1
-1
Documentation/ABI/testing/configfs-usb-gadget-sourcesink
Documentation/ABI/testing/configfs-usb-gadget-sourcesink
+1
-1
Documentation/ABI/testing/configfs-usb-gadget-subset
Documentation/ABI/testing/configfs-usb-gadget-subset
+1
-1
Documentation/ABI/testing/sysfs-bus-rbd
Documentation/ABI/testing/sysfs-bus-rbd
+26
-0
Documentation/DocBook/media/v4l/compat.xml
Documentation/DocBook/media/v4l/compat.xml
+12
-0
Documentation/DocBook/media/v4l/controls.xml
Documentation/DocBook/media/v4l/controls.xml
+41
-0
Documentation/DocBook/media/v4l/dev-overlay.xml
Documentation/DocBook/media/v4l/dev-overlay.xml
+3
-6
Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
+9
-0
No files found.
Too many changes to show.
To preserve performance only
1000 of 1000+
files are displayed.
Plain diff
Email patch
CREDITS
View file @
bf5f4833
...
...
@@ -823,8 +823,8 @@ S: D-69231 Rauenberg
S: Germany
N: Jean Delvare
E:
khali@linux-fr.org
W: http://
khali.linux-fr.org
/
E:
jdelvare@suse.de
W: http://
jdelvare.nerim.net
/
D: Several hardware monitoring drivers
S: France
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget
View file @
bf5f4833
What: /config/usb-gadget
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
This group contains sub-groups corresponding to created
USB gadgets.
What: /config/usb-gadget/gadget
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
The attributes of a gadget:
...
...
@@ -27,7 +27,7 @@ Description:
What: /config/usb-gadget/gadget/configs
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
This group contains a USB gadget's configurations
...
...
@@ -58,20 +58,20 @@ Description:
What: /config/usb-gadget/gadget/functions
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
This group contains functions available to this USB gadget.
What: /config/usb-gadget/gadget/strings
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
This group contains subdirectories for language-specific
strings for this gadget.
What: /config/usb-gadget/gadget/strings/language
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
The attributes:
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget-acm
View file @
bf5f4833
What: /config/usb-gadget/gadget/functions/acm.name
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
This item contains just one readonly attribute: port_num.
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget-ecm
View file @
bf5f4833
What: /config/usb-gadget/gadget/functions/ecm.name
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
The attributes:
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget-eem
View file @
bf5f4833
What: /config/usb-gadget/gadget/functions/eem.name
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
The attributes:
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget-ffs
View file @
bf5f4833
What: /config/usb-gadget/gadget/functions/ffs.name
Date: Nov 2013
KenelVersion: 3.13
Ke
r
nelVersion: 3.13
Description: The purpose of this directory is to create and remove it.
A corresponding USB function instance is created/removed.
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget-loopback
View file @
bf5f4833
What: /config/usb-gadget/gadget/functions/Loopback.name
Date: Nov 2013
KenelVersion: 3.13
Ke
r
nelVersion: 3.13
Description:
The attributes:
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget-mass-storage
View file @
bf5f4833
What: /config/usb-gadget/gadget/functions/mass_storage.name
Date: Oct 2013
KenelVersion: 3.13
Ke
r
nelVersion: 3.13
Description:
The attributes:
...
...
@@ -13,7 +13,7 @@ Description:
What: /config/usb-gadget/gadget/functions/mass_storage.name/lun.name
Date: Oct 2013
KenelVersion: 3.13
Ke
r
nelVersion: 3.13
Description:
The attributes:
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget-ncm
View file @
bf5f4833
What: /config/usb-gadget/gadget/functions/ncm.name
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
The attributes:
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget-obex
View file @
bf5f4833
What: /config/usb-gadget/gadget/functions/obex.name
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
This item contains just one readonly attribute: port_num.
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget-phonet
View file @
bf5f4833
What: /config/usb-gadget/gadget/functions/phonet.name
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
This item contains just one readonly attribute: ifname.
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget-rndis
View file @
bf5f4833
What: /config/usb-gadget/gadget/functions/rndis.name
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
The attributes:
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget-serial
View file @
bf5f4833
What: /config/usb-gadget/gadget/functions/gser.name
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
This item contains just one readonly attribute: port_num.
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget-sourcesink
View file @
bf5f4833
What: /config/usb-gadget/gadget/functions/SourceSink.name
Date: Nov 2013
KenelVersion: 3.13
Ke
r
nelVersion: 3.13
Description:
The attributes:
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/configfs-usb-gadget-subset
View file @
bf5f4833
What: /config/usb-gadget/gadget/functions/geth.name
Date: Jun 2013
KenelVersion: 3.11
Ke
r
nelVersion: 3.11
Description:
The attributes:
...
...
This diff is collapsed.
Click to expand it.
Documentation/ABI/testing/sysfs-bus-rbd
View file @
bf5f4833
...
...
@@ -18,6 +18,28 @@ Removal of a device:
$ echo <dev-id> > /sys/bus/rbd/remove
What: /sys/bus/rbd/add_single_major
Date: December 2013
KernelVersion: 3.14
Contact: Sage Weil <sage@inktank.com>
Description: Available only if rbd module is inserted with single_major
parameter set to true.
Usage is the same as for /sys/bus/rbd/add. If present,
should be used instead of the latter: any attempts to use
/sys/bus/rbd/add if /sys/bus/rbd/add_single_major is
available will fail for backwards compatibility reasons.
What: /sys/bus/rbd/remove_single_major
Date: December 2013
KernelVersion: 3.14
Contact: Sage Weil <sage@inktank.com>
Description: Available only if rbd module is inserted with single_major
parameter set to true.
Usage is the same as for /sys/bus/rbd/remove. If present,
should be used instead of the latter: any attempts to use
/sys/bus/rbd/remove if /sys/bus/rbd/remove_single_major is
available will fail for backwards compatibility reasons.
Entries under /sys/bus/rbd/devices/<dev-id>/
--------------------------------------------
...
...
@@ -33,6 +55,10 @@ major
The block device major number.
minor
The block device minor number. (December 2013, since 3.14.)
name
The name of the rbd image.
...
...
This diff is collapsed.
Click to expand it.
Documentation/DocBook/media/v4l/compat.xml
View file @
bf5f4833
...
...
@@ -2523,6 +2523,18 @@ that used it. It was originally scheduled for removal in 2.6.35.
</orderedlist>
</section>
<section>
<title>
V4L2 in Linux 3.14
</title>
<orderedlist>
<listitem>
<para>
In struct
<structname>
v4l2_rect
</structname>
, the type
of
<structfield>
width
</structfield>
and
<structfield>
height
</structfield>
fields changed from _s32 to _u32.
</para>
</listitem>
</orderedlist>
</section>
<section
id=
"other"
>
<title>
Relation of V4L2 to other Linux multimedia APIs
</title>
...
...
This diff is collapsed.
Click to expand it.
Documentation/DocBook/media/v4l/controls.xml
View file @
bf5f4833
...
...
@@ -3161,6 +3161,47 @@ V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_REF_PERIOD as a golden frame.</entry>
</entrytbl>
</row>
<row><entry></entry></row>
<row>
<entry
spanname=
"id"
><constant>
V4L2_CID_MPEG_VIDEO_VPX_MIN_QP
</constant></entry>
<entry>
integer
</entry>
</row>
<row><entry
spanname=
"descr"
>
Minimum quantization parameter for VP8.
</entry>
</row>
<row><entry></entry></row>
<row>
<entry
spanname=
"id"
><constant>
V4L2_CID_MPEG_VIDEO_VPX_MAX_QP
</constant></entry>
<entry>
integer
</entry>
</row>
<row><entry
spanname=
"descr"
>
Maximum quantization parameter for VP8.
</entry>
</row>
<row><entry></entry></row>
<row>
<entry
spanname=
"id"
><constant>
V4L2_CID_MPEG_VIDEO_VPX_I_FRAME_QP
</constant>
</entry>
<entry>
integer
</entry>
</row>
<row><entry
spanname=
"descr"
>
Quantization parameter for an I frame for VP8.
</entry>
</row>
<row><entry></entry></row>
<row>
<entry
spanname=
"id"
><constant>
V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP
</constant>
</entry>
<entry>
integer
</entry>
</row>
<row><entry
spanname=
"descr"
>
Quantization parameter for a P frame for VP8.
</entry>
</row>
<row><entry></entry></row>
<row>
<entry
spanname=
"id"
><constant>
V4L2_CID_MPEG_VIDEO_VPX_PROFILE
</constant>
</entry>
<entry>
integer
</entry>
</row>
<row><entry
spanname=
"descr"
>
Select the desired profile for VPx encoder.
Acceptable values are 0, 1, 2 and 3 corresponding to encoder profiles 0, 1, 2 and 3.
</entry>
</row>
<row><entry></entry></row>
</tbody>
</tgroup>
...
...
This diff is collapsed.
Click to expand it.
Documentation/DocBook/media/v4l/dev-overlay.xml
View file @
bf5f4833
...
...
@@ -346,17 +346,14 @@ rectangle, in pixels.</entry>
rectangle, in pixels. Offsets increase to the right and down.
</entry>
</row>
<row>
<entry>
__
s
32
</entry>
<entry>
__
u
32
</entry>
<entry><structfield>
width
</structfield></entry>
<entry>
Width of the rectangle, in pixels.
</entry>
</row>
<row>
<entry>
__
s
32
</entry>
<entry>
__
u
32
</entry>
<entry><structfield>
height
</structfield></entry>
<entry>
Height of the rectangle, in pixels. Width and
height cannot be negative, the fields are signed for hysterical
reasons.
<!-- video4linux-list@redhat.com on 22 Oct 2002 subject
"Re:[V4L][patches!] Re:v4l2/kernel-2.5" -->
</entry>
<entry>
Height of the rectangle, in pixels.
</entry>
</row>
</tbody>
</tgroup>
...
...
This diff is collapsed.
Click to expand it.
Documentation/DocBook/media/v4l/media-ioc-enum-links.xml
View file @
bf5f4833
...
...
@@ -134,6 +134,15 @@
<entry>
Output pad, relative to the entity. Output pads source data
and are origins of links.
</entry>
</row>
<row>
<entry><constant>
MEDIA_PAD_FL_MUST_CONNECT
</constant></entry>
<entry>
If this flag is set and the pad is linked to any other
pad, then at least one of those links must be enabled for the
entity to be able to stream. There could be temporary reasons
(e.g. device configuration dependent) for the pad to need
enabled links even when this flag isn't set; the absence of the
flag doesn't imply there is none.
</entry>
</row>
</tbody>
</tgroup>
</table>
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
4
5
…
50
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment