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
Showing
- Documentation/ioctl/ioctl-number.txt 0 additions, 2 deletionsDocumentation/ioctl/ioctl-number.txt
- Documentation/networking/ip-sysctl.txt 0 additions, 15 deletionsDocumentation/networking/ip-sysctl.txt
- Documentation/process/magic-number.rst 0 additions, 3 deletionsDocumentation/process/magic-number.rst
- MAINTAINERS 0 additions, 10 deletionsMAINTAINERS
- drivers/staging/wilc1000/host_interface.c 1 addition, 1 deletiondrivers/staging/wilc1000/host_interface.c
- include/uapi/linux/sysctl.h 0 additions, 18 deletionsinclude/uapi/linux/sysctl.h
- kernel/sysctl_binary.c 1 addition, 19 deletionskernel/sysctl_binary.c
Please register or sign in to comment