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

Commit 9ce0d731 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'v3.18.24' of... 

Merge tag 'v3.18.24' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.18

Linux 3.18.24

# gpg: Signature made Sat Oct 31 13:44:30 2015 PDT using RSA key ID 97772CDC
# gpg: Can't check signature: public key not found

* tag 'v3.18.24' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (234 commits)
  Linux 3.18.24
  tty: fix stall caused by missing memory barrier in drivers/tty/n_tty.c
  Revert "tty: fix stall caused by missing memory barrier in drivers/tty/n_tty.c"
  Linux 3.18.23
  x86: Init per-cpu shadow copy of CR4 on 32-bit CPUs too
  3w-9xxx: don't unmap bounce buffered commands
  fib_rules: Fix dump_rules() not to exit early
  vfs: Test for and handle paths that are unreachable from their mnt_root
  md: flush ->event_work before stopping array.
  x86/nmi/64: Fix a paravirt stack-clobbering bug in the NMI code
  Revert "iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required"
  net: Fix skb_set_peeked use-after-free bug
  mm: check if section present during memory block registering
  hpfs: update ctime and mtime on directory modification
  drivercore: Fix unregistration path of platform devices
  ARM: OMAP2+: DRA7: clockdomain: change l4per2_7xx_clkdm to SW_WKUP
  of/address: Don't loop forever in of_find_matching_node_by_address().
  auxdisplay: ks0108: fix refcount
  Doc: ABI: testing: configfs-usb-gadget-sourcesink
  Doc: ABI: testing: configfs-usb-gadget-loopback
  ...
parents c1fa1636 b1240304

Documentation/ABI/testing/configfs-usb-gadget-loopback

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ Description: 
		The attributes:



		qlen		- depth of loopback queue

		bulk_buflen	- buffer length
 
		buflen		- buffer length

Documentation/ABI/testing/configfs-usb-gadget-sourcesink

+1 −1
Original line number Diff line number Diff line
@@ -9,4 +9,4 @@ Description: 
		isoc_maxpacket	- 0 - 1023 (fs), 0 - 1024 (hs/ss)

		isoc_mult	- 0..2 (hs/ss only)

		isoc_maxburst	- 0..15 (ss only)

		qlen		- buffer length
 
		buflen		- buffer length

Documentation/HOWTO

+14 −14
Original line number Diff line number Diff line
@@ -218,16 +218,16 @@ The development process 
Linux kernel development process currently consists of a few different

main kernel "branches" and lots of different subsystem-specific kernel

branches.  These different branches are:

  - main 3.x kernel tree

  - 3.x.y -stable kernel tree

  - 3.x -git kernel patches

  - main 4.x kernel tree

  - 4.x.y -stable kernel tree

  - 4.x -git kernel patches

  - subsystem specific kernel trees and patches

  - the 3.x -next kernel tree for integration tests

  - the 4.x -next kernel tree for integration tests



3.x kernel tree

4.x kernel tree

-----------------

3.x kernels are maintained by Linus Torvalds, and can be found on

kernel.org in the pub/linux/kernel/v3.x/ directory.  Its development

4.x kernels are maintained by Linus Torvalds, and can be found on

kernel.org in the pub/linux/kernel/v4.x/ directory.  Its development

process is as follows:

  - As soon as a new kernel is released a two weeks window is open,

    during this period of time maintainers can submit big diffs to
@@ -262,20 +262,20 @@ mailing list about kernel releases: 
	released according to perceived bug status, not according to a

	preconceived timeline."



3.x.y -stable kernel tree

4.x.y -stable kernel tree

---------------------------

Kernels with 3-part versions are -stable kernels. They contain

relatively small and critical fixes for security problems or significant

regressions discovered in a given 3.x kernel.

regressions discovered in a given 4.x kernel.



This is the recommended branch for users who want the most recent stable

kernel and are not interested in helping test development/experimental

versions.



If no 3.x.y kernel is available, then the highest numbered 3.x

If no 4.x.y kernel is available, then the highest numbered 4.x

kernel is the current stable kernel.



3.x.y are maintained by the "stable" team <stable@vger.kernel.org>, and

4.x.y are maintained by the "stable" team <stable@vger.kernel.org>, and

are released as needs dictate.  The normal release period is approximately

two weeks, but it can be longer if there are no pressing problems.  A

security-related problem, instead, can cause a release to happen almost
@@ -285,7 +285,7 @@ The file Documentation/stable_kernel_rules.txt in the kernel tree 
documents what kinds of changes are acceptable for the -stable tree, and

how the release process works.



3.x -git patches

4.x -git patches

------------------

These are daily snapshots of Linus' kernel tree which are managed in a

git repository (hence the name.) These patches are usually released
@@ -317,9 +317,9 @@ revisions to it, and maintainers can mark patches as under review, 
accepted, or rejected.  Most of these patchwork sites are listed at

http://patchwork.kernel.org/.



3.x -next kernel tree for integration tests

4.x -next kernel tree for integration tests

---------------------------------------------

Before updates from subsystem trees are merged into the mainline 3.x

Before updates from subsystem trees are merged into the mainline 4.x

tree, they need to be integration-tested.  For this purpose, a special

testing repository exists into which virtually all subsystem trees are

pulled on an almost daily basis:

Documentation/devicetree/bindings/net/ethernet.txt

+4 −0
Original line number Diff line number Diff line
@@ -19,7 +19,11 @@ The following properties are common to the Ethernet controllers: 
- phy: the same as "phy-handle" property, not recommended for new bindings.

- phy-device: the same as "phy-handle" property, not recommended for new

  bindings.

- managed: string, specifies the PHY management type. Supported values are:

  "auto", "in-band-status". "auto" is the default, it usess MDIO for

  management if fixed-link is not specified.



Child nodes of the Ethernet controller are typically the individual PHY devices

connected via the MDIO bus (sometimes the MDIO bus controller is separate).

They are described in the phy.txt file in this same directory.

For non-MDIO PHY management see fixed-link.txt.

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 22

SUBLEVEL = 24

EXTRAVERSION =

NAME = Diseased Newt