Commit bb65619e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-5.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fixes from Greg KH:
 "Here are some small char/misc driver fixes for 5.6-rc3.

  Also included in here are some updates for some documentation files
  that I seem to be maintaining these days.

  The driver fixes are:
   - small fixes for the habanalabs driver
   - fsi driver bugfix

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-5.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  Documentation/process: Swap out the ambassador for Canonical
  habanalabs: patched cb equals user cb in device memset
  habanalabs: do not halt CoreSight during hard reset
  habanalabs: halt the engines before hard-reset
  MAINTAINERS: remove unnecessary ':' characters
  fsi: aspeed: add unspecified HAS_IOMEM dependency
  COPYING: state that all contributions really are covered by this file
  Documentation/process: Change Microsoft contact for embargoed hardware issues
  embargoed-hardware-issues: drop Amazon contact as the email address now bounces
  Documentation/process: Add Arm contact for embargoed HW issues
parents e5553ac7 74ba569a

COPYING

+2 −0
Original line number Diff line number Diff line
@@ -16,3 +16,5 @@ In addition, other licenses may also apply. Please see: 
	Documentation/process/license-rules.rst



for more details.



All contributions to the Linux Kernel are subject to this COPYING file.

Documentation/process/embargoed-hardware-issues.rst

+4 −4
Original line number Diff line number Diff line
@@ -244,23 +244,23 @@ disclosure of a particular issue, unless requested by a response team or by 
an involved disclosed party. The current ambassadors list:



  ============= ========================================================

  ARM

  ARM           Grant Likely <grant.likely@arm.com>

  AMD		Tom Lendacky <tom.lendacky@amd.com>

  IBM

  Intel		Tony Luck <tony.luck@intel.com>

  Qualcomm	Trilok Soni <tsoni@codeaurora.org>



  Microsoft	Sasha Levin <sashal@kernel.org>

  Microsoft	James Morris <jamorris@linux.microsoft.com>

  VMware

  Xen		Andrew Cooper <andrew.cooper3@citrix.com>



  Canonical	Tyler Hicks <tyhicks@canonical.com>

  Canonical	John Johansen <john.johansen@canonical.com>

  Debian	Ben Hutchings <ben@decadent.org.uk>

  Oracle	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

  Red Hat	Josh Poimboeuf <jpoimboe@redhat.com>

  SUSE		Jiri Kosina <jkosina@suse.cz>



  Amazon	Peter Bowen <pzb@amzn.com>

  Amazon

  Google	Kees Cook <keescook@chromium.org>

  ============= ========================================================

Documentation/translations/zh_CN/process/embargoed-hardware-issues.rst

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ CVE分配 
  VMware

  Xen		Andrew Cooper <andrew.cooper3@citrix.com>



  Canonical	Tyler Hicks <tyhicks@canonical.com>

  Canonical	John Johansen <john.johansen@canonical.com>

  Debian	Ben Hutchings <ben@decadent.org.uk>

  Oracle	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

  Red Hat	Josh Poimboeuf <jpoimboe@redhat.com>

MAINTAINERS

+11 −11
Original line number Diff line number Diff line
@@ -3909,7 +3909,7 @@ S: Supported 
F:	Documentation/filesystems/ceph.txt

F:	fs/ceph/













CERTIFICATE HANDLING:













CERTIFICATE HANDLING















M:	David Howells <dhowells@redhat.com>















M:	David Woodhouse <dwmw2@infradead.org>















L:	keyrings@vger.kernel.org









@@ -3919,7 +3919,7 @@ F:	certs/













F:	scripts/sign-file.c















F:	scripts/extract-cert.c



























CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:













CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM















L:	devel@driverdev.osuosl.org















S:	Obsolete















F:	drivers/staging/wusbcore/










@@ -7047,7 +7047,7 @@ L:	kvm@vger.kernel.org













S:	Supported















F:	drivers/uio/uio_pci_generic.c



























GENERIC VDSO LIBRARY:













GENERIC VDSO LIBRARY















M:	Andy Lutomirski <luto@kernel.org>















M:	Thomas Gleixner <tglx@linutronix.de>















M:	Vincenzo Frascino <vincenzo.frascino@arm.com>










@@ -9278,7 +9278,7 @@ F:	include/keys/trusted-type.h













F:	security/keys/trusted.c















F:	include/keys/trusted.h



























KEYS/KEYRINGS:













KEYS/KEYRINGS















M:	David Howells <dhowells@redhat.com>















M:	Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>















L:	keyrings@vger.kernel.org










@@ -11484,7 +11484,7 @@ F:	drivers/scsi/mac_scsi.*













F:	drivers/scsi/sun3_scsi.*















F:	drivers/scsi/sun3_scsi_vme.c



























NCSI LIBRARY:













NCSI LIBRARY















M:	Samuel Mendoza-Jonas <sam@mendozajonas.com>















S:	Maintained















F:	net/ncsi/










@@ -13512,7 +13512,7 @@ L:	linuxppc-dev@lists.ozlabs.org













S:	Maintained















F:	drivers/block/ps3vram.c



























PSAMPLE PACKET SAMPLING SUPPORT:













PSAMPLE PACKET SAMPLING SUPPORT















M:	Yotam Gigi <yotam.gi@gmail.com>















S:	Maintained















F:	net/psample










@@ -17080,7 +17080,7 @@ S:	Maintained













F:	Documentation/admin-guide/ufs.rst















F:	fs/ufs/



























UHID USERSPACE HID IO DRIVER:













UHID USERSPACE HID IO DRIVER















M:	David Herrmann <dh.herrmann@googlemail.com>















L:	linux-input@vger.kernel.org















S:	Maintained









@@ -17094,18 +17094,18 @@ S:	Maintained













F:	drivers/usb/common/ulpi.c















F:	include/linux/ulpi/



























ULTRA-WIDEBAND (UWB) SUBSYSTEM:













ULTRA-WIDEBAND (UWB) SUBSYSTEM















L:	devel@driverdev.osuosl.org















S:	Obsolete















F:	drivers/staging/uwb/



























UNICODE SUBSYSTEM:













UNICODE SUBSYSTEM















M:	Gabriel Krisman Bertazi <krisman@collabora.com>















L:	linux-fsdevel@vger.kernel.org















S:	Supported















F:	fs/unicode/



























UNICORE32 ARCHITECTURE:













UNICORE32 ARCHITECTURE















M:	Guan Xuetao <gxt@pku.edu.cn>















W:	http://mprc.pku.edu.cn/~guanxuetao/linux















S:	Maintained










@@ -17791,7 +17791,7 @@ F:	include/linux/vbox_utils.h













F:	include/uapi/linux/vbox*.h















F:	drivers/virt/vboxguest/



























VIRTUAL BOX SHARED FOLDER VFS DRIVER:













VIRTUAL BOX SHARED FOLDER VFS DRIVER















M:	Hans de Goede <hdegoede@redhat.com>















L:	linux-fsdevel@vger.kernel.org















S:	Maintained

























drivers/fsi/Kconfig



+1
−0






























Original line number
Diff line number
Diff line








@@ -55,6 +55,7 @@ config FSI_MASTER_AST_CF





























config FSI_MASTER_ASPEED















	tristate "FSI ASPEED master"













	depends on HAS_IOMEM















	help















	 This option enables a FSI master that is present behind an OPB bridge















	 in the AST2600.









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE