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

Commit edd849e5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2017-03-21' of git://anongit.freedesktop.org/git/drm-misc into drm-next 

drm-misc for 4.12, 2nd attempt this week:

- topic branch from Jon Corbet for the new graph kerneldoc support
- lots of graphs for kms/atomic things using the above
- some vblank query tuning from Chris
- gem/cma_fops macros
- moar docs

Driver stuff:
- vc4 hdmi audio, yay (Eric)
- dw-hdmi polish from a bunch of people
- some rockchip dp updates that didn't make last week (Chris Zhong)
- misc bridge&driver updates

* tag 'drm-misc-next-2017-03-21' of git://anongit.freedesktop.org/git/drm-misc: (37 commits)
  drm/edid: detect SCDC support in HF-VSDB
  drm/edid: detect SCDC support in HF-VSDB
  drm/edid: check for HF-VSDB block
  drm: Add SCDC helpers
  drm: bridge: dw-hdmi: add HDMI vendor specific infoframe config
  drm/bridge: dw_hdmi: support i2c extended read mode
  drm/msm: add stubs for msm_{perf,rd}_debugfs_cleanup
  drm: bochs: Don't remove uninitialized fbdev framebuffer
  drm: vc4: remove redundant check of plane being non-null
  drm/vc4: use platform_register_drivers
  dma-fence: add dma_fence_match_context helper
  drm/vc4: Add HDMI audio support
  dt-bindings: Document the dmas and dma-names properties for VC4 HDMI
  drm/atmel-hlcdc: Fix suspend/resume implementation
  drm: Skip the waitqueue setup for vblank queries
  drm: Defer disabling the vblank IRQ until the next interrupt (for instant-off)
  drm/doc: atomic overview, with graph
  drm/doc: diagram for mode objects and properties
  drm/doc: Consistent kerneldoc include order
  drm/doc: Add KMS overview graphs
  ...
parents be5df20a 62c58af3

Documentation/ABI/testing/sysfs-bus-pci

+1 −1
Original line number Diff line number Diff line
@@ -299,5 +299,5 @@ What: /sys/bus/pci/devices/.../revision 
Date:		November 2016

Contact:	Emil Velikov <emil.l.velikov@gmail.com>

Description:

		This file contains the revision field of the the PCI device.

		This file contains the revision field of the PCI device.

		The value comes from device config space. The file is read only.

Documentation/admin-guide/security-bugs.rst

+34 −5
Original line number Diff line number Diff line
@@ -14,14 +14,17 @@ Contact 
The Linux kernel security team can be contacted by email at

<security@kernel.org>.  This is a private list of security officers

who will help verify the bug report and develop and release a fix.

It is possible that the security team will bring in extra help from

area maintainers to understand and fix the security vulnerability.

If you already have a fix, please include it with your report, as

that can speed up the process considerably.  It is possible that the

security team will bring in extra help from area maintainers to

understand and fix the security vulnerability.



As it is with any bug, the more information provided the easier it

will be to diagnose and fix.  Please review the procedure outlined in

admin-guide/reporting-bugs.rst if you are unclear about what information is helpful.

Any exploit code is very helpful and will not be released without

consent from the reporter unless it has already been made public.

admin-guide/reporting-bugs.rst if you are unclear about what

information is helpful.  Any exploit code is very helpful and will not

be released without consent from the reporter unless it has already been

made public.



Disclosure

----------
@@ -39,6 +42,32 @@ disclosure is from immediate (esp. if it's already publicly known) 
to a few weeks.  As a basic default policy, we expect report date to

disclosure date to be on the order of 7 days.



Coordination

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



Fixes for sensitive bugs, such as those that might lead to privilege

escalations, may need to be coordinated with the private

<linux-distros@vs.openwall.org> mailing list so that distribution vendors

are well prepared to issue a fixed kernel upon public disclosure of the

upstream fix. Distros will need some time to test the proposed patch and

will generally request at least a few days of embargo, and vendor update

publication prefers to happen Tuesday through Thursday. When appropriate,

the security team can assist with this coordination, or the reporter can

include linux-distros from the start. In this case, remember to prefix

the email Subject line with "[vs]" as described in the linux-distros wiki:

<http://oss-security.openwall.org/wiki/mailing-lists/distros#how-to-use-the-lists>



CVE assignment

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



The security team does not normally assign CVEs, nor do we require them

for reports or fixes, as this can needlessly complicate the process and

may delay the bug handling. If a reporter wishes to have a CVE identifier

assigned ahead of public disclosure, they will need to contact the private

linux-distros list, described above. When such a CVE identifier is known

before a patch is provided, it is desirable to mention it in the commit

message, though.



Non-disclosure agreements

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

Documentation/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ from load_config import loadConfig 
# Add any Sphinx extension module names here, as strings. They can be

# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom

# ones.

extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain']

extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kfigure']



# The name of the math extension changed on Sphinx 1.4

if major == 1 and minor > 3:

Documentation/cpu-freq/cpu-drivers.txt

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ the reference implementation in drivers/cpufreq/longrun.c 
Only for drivers with target_index() and CPUFREQ_ASYNC_NOTIFICATION unset.



get_intermediate should return a stable intermediate frequency platform wants to

switch to, and target_intermediate() should set CPU to to that frequency, before

switch to, and target_intermediate() should set CPU to that frequency, before

jumping to the frequency corresponding to 'index'. Core will take care of

sending notifications and driver doesn't have to handle them in

target_intermediate() or target_index().

Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ Optional properties for HDMI: 
- hpd-gpios:	The GPIO pin for HDMI hotplug detect (if it doesn't appear

		  as an interrupt/status bit in the HDMI controller

		  itself).  See bindings/pinctrl/brcm,bcm2835-gpio.txt

- dmas:		Should contain one entry pointing to the DMA channel used to

		transfer audio data

- dma-names:	Should contain "audio-rx"



Required properties for DPI:

- compatible:	Should be "brcm,bcm2835-dpi"