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

Commit 79a17dd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging fixes from Greg KH:
 "Here are two staging driver fixups for 4.17-rc3.

  The first is the remaining stragglers of the irda code removal that
  you pointed out during the merge window. The second is a fix for the
  wilc1000 driver due to a patch that got merged in 4.17-rc1.

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

* tag 'staging-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: wilc1000: fix NULL pointer exception in host_int_parse_assoc_resp_info()
  staging: irda: remove remaining remants of irda code removal
parents 1993cbf0 b00e2fd1

Documentation/ioctl/ioctl-number.txt

+0 −2
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ Code Seq#(hex) Include File Comments 
'd'	02-40	pcmcia/ds.h		conflict!

'd'	F0-FF	linux/digi1.h

'e'	all	linux/digi1.h		conflict!

'e'	00-1F	drivers/net/irda/irtty-sir.h	conflict!

'f'	00-1F	linux/ext2_fs.h		conflict!

'f'	00-1F	linux/ext3_fs.h		conflict!

'f'	00-0F	fs/jfs/jfs_dinode.h	conflict!
@@ -247,7 +246,6 @@ Code Seq#(hex) Include File Comments 
'm'	all	linux/synclink.h	conflict!

'm'	00-19	drivers/message/fusion/mptctl.h	conflict!

'm'	00	drivers/scsi/megaraid/megaraid_ioctl.h	conflict!

'm'	00-1F	net/irda/irmod.h	conflict!

'n'	00-7F	linux/ncp_fs.h and fs/ncpfs/ioctl.c

'n'	80-8F	uapi/linux/nilfs2_api.h	NILFS2

'n'	E0-FF	linux/matroxfb.h	matroxfb

Documentation/networking/ip-sysctl.txt

+0 −15
Original line number Diff line number Diff line
@@ -2126,18 +2126,3 @@ max_dgram_qlen - INTEGER 


	Default: 10



UNDOCUMENTED:



/proc/sys/net/irda/*

	fast_poll_increase FIXME

	warn_noreply_time FIXME

	discovery_slots FIXME

	slot_timeout FIXME

	max_baud_rate FIXME

	discovery_timeout FIXME

	lap_keepalive_time FIXME

	max_noreply_time FIXME

	max_tx_data_size FIXME

	max_tx_window FIXME

	min_tx_turn_time FIXME

Documentation/process/magic-number.rst

+0 −3
Original line number Diff line number Diff line
@@ -157,8 +157,5 @@ memory management. See ``include/sound/sndmagic.h`` for complete list of them. M 
OSS sound drivers have their magic numbers constructed from the soundcard PCI

ID - these are not listed here as well.



IrDA subsystem also uses large number of own magic numbers, see

``include/net/irda/irda.h`` for a complete list of them.



HFS is another larger user of magic numbers - you can find them in

``fs/hfs/hfs.h``.

MAINTAINERS

+0 −10
Original line number Diff line number Diff line
@@ -7410,16 +7410,6 @@ S: Obsolete 
F:	include/uapi/linux/ipx.h

F:	drivers/staging/ipx/



IRDA SUBSYSTEM

M:	Samuel Ortiz <samuel@sortiz.org>

L:	irda-users@lists.sourceforge.net (subscribers-only)

L:	netdev@vger.kernel.org

W:	http://irda.sourceforge.net/

S:	Obsolete

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git

F:	Documentation/networking/irda.txt

F:	drivers/staging/irda/



IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)

M:	Marc Zyngier <marc.zyngier@arm.com>

S:	Maintained

drivers/staging/wilc1000/host_interface.c

+1 −1
Original line number Diff line number Diff line
@@ -1390,7 +1390,7 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif, 
	}



	if (hif_drv->usr_conn_req.ies) {

		conn_info.req_ies = kmemdup(conn_info.req_ies,

		conn_info.req_ies = kmemdup(hif_drv->usr_conn_req.ies,

					    hif_drv->usr_conn_req.ies_len,

					    GFP_KERNEL);

		if (conn_info.req_ies)