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

Commit cf2394f7 authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'v3.18-rc4' into regulator-max77802 

Linux 3.18-rc4
parents 45fc84c6 206c5f60

Documentation/ABI/testing/sysfs-ibft

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,4 +20,4 @@ Date: November 2007 
Contact:	Konrad Rzeszutek <ketuzsezr@darnok.org>

Contact:	Konrad Rzeszutek <ketuzsezr@darnok.org>

Description:	The /sys/firmware/ibft/ethernetX directory will contain

Description:	The /sys/firmware/ibft/ethernetX directory will contain

		files that expose the iSCSI Boot Firmware Table NIC data.

		files that expose the iSCSI Boot Firmware Table NIC data.

		This can this can the IP address, MAC, and gateway of the NIC.
 
		Usually this contains the IP address, MAC, and gateway of the NIC.

Documentation/DocBook/media/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ GENFILES := $(addprefix $(MEDIA_OBJ_DIR)/, $(MEDIA_TEMP)) 
PHONY += cleanmediadocs

PHONY += cleanmediadocs





cleanmediadocs:

cleanmediadocs:

	-@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null

	-@rm -f `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null





$(obj)/media_api.xml: $(GENFILES) FORCE

$(obj)/media_api.xml: $(GENFILES) FORCE

Documentation/DocBook/media/v4l/compat.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -2566,6 +2566,10 @@ fields changed from _s32 to _u32. 
	  <para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;.

	  <para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;.

	  </para>

	  </para>

        </listitem>

        </listitem>

      </orderedlist>

    </section>



    <section>

      <title>V4L2 in Linux 3.18</title>

      <title>V4L2 in Linux 3.18</title>

      <orderedlist>

      <orderedlist>

	<listitem>

	<listitem>

Documentation/HOWTO

+0 −1
Original line number Original line Diff line number Diff line
@@ -324,7 +324,6 @@ tree, they need to be integration-tested. For this purpose, a special 
testing repository exists into which virtually all subsystem trees are

testing repository exists into which virtually all subsystem trees are

pulled on an almost daily basis:

pulled on an almost daily basis:

	http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git

	http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git

	http://linux.f-seidel.de/linux-next/pmwiki/





This way, the -next kernel gives a summary outlook onto what will be

This way, the -next kernel gives a summary outlook onto what will be

expected to go into the mainline kernel at the next merge period.

expected to go into the mainline kernel at the next merge period.

Documentation/SubmittingPatches

+4 −6
Original line number Original line Diff line number Diff line
@@ -483,12 +483,10 @@ have been included in the discussion 




14) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:

14) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:





If this patch fixes a problem reported by somebody else, consider adding a

The Reported-by tag gives credit to people who find bugs and report them and it

Reported-by: tag to credit the reporter for their contribution.  Please

hopefully inspires them to help us again in the future.  Please note that if

note that this tag should not be added without the reporter's permission,

the bug was reported in private, then ask for permission first before using the

especially if the problem was not reported in a public forum.  That said,

Reported-by tag.

if we diligently credit our bug reporters, they will, hopefully, be

inspired to help us again in the future.





A Tested-by: tag indicates that the patch has been successfully tested (in

A Tested-by: tag indicates that the patch has been successfully tested (in

some environment) by the person named.  This tag informs maintainers that

some environment) by the person named.  This tag informs maintainers that