Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-68
-2
Documentation/ioctl/ioctl-number.txt
-2
Documentation/ioctl/ioctl-number.txt
···
217
217
'd' 02-40 pcmcia/ds.h conflict!
218
218
'd' F0-FF linux/digi1.h
219
219
'e' all linux/digi1.h conflict!
220
-
'e' 00-1F drivers/net/irda/irtty-sir.h conflict!
221
220
'f' 00-1F linux/ext2_fs.h conflict!
222
221
'f' 00-1F linux/ext3_fs.h conflict!
223
222
'f' 00-0F fs/jfs/jfs_dinode.h conflict!
···
246
247
'm' all linux/synclink.h conflict!
247
248
'm' 00-19 drivers/message/fusion/mptctl.h conflict!
248
249
'm' 00 drivers/scsi/megaraid/megaraid_ioctl.h conflict!
249
-
'm' 00-1F net/irda/irmod.h conflict!
250
250
'n' 00-7F linux/ncp_fs.h and fs/ncpfs/ioctl.c
251
251
'n' 80-8F uapi/linux/nilfs2_api.h NILFS2
252
252
'n' E0-FF linux/matroxfb.h matroxfb
-15
Documentation/networking/ip-sysctl.txt
-15
Documentation/networking/ip-sysctl.txt
···
2126
2126
2127
2127
Default: 10
2128
2128
2129
-
2130
-
UNDOCUMENTED:
2131
-
2132
-
/proc/sys/net/irda/*
2133
-
fast_poll_increase FIXME
2134
-
warn_noreply_time FIXME
2135
-
discovery_slots FIXME
2136
-
slot_timeout FIXME
2137
-
max_baud_rate FIXME
2138
-
discovery_timeout FIXME
2139
-
lap_keepalive_time FIXME
2140
-
max_noreply_time FIXME
2141
-
max_tx_data_size FIXME
2142
-
max_tx_window FIXME
2143
-
min_tx_turn_time FIXME
-3
Documentation/process/magic-number.rst
-3
Documentation/process/magic-number.rst
···
157
157
OSS sound drivers have their magic numbers constructed from the soundcard PCI
158
158
ID - these are not listed here as well.
159
159
160
-
IrDA subsystem also uses large number of own magic numbers, see
161
-
``include/net/irda/irda.h`` for a complete list of them.
162
-
163
160
HFS is another larger user of magic numbers - you can find them in
164
161
``fs/hfs/hfs.h``.
-10
MAINTAINERS
-10
MAINTAINERS
···
7410
7410
F: include/uapi/linux/ipx.h
7411
7411
F: drivers/staging/ipx/
7412
7412
7413
-
IRDA SUBSYSTEM
7414
-
M: Samuel Ortiz <samuel@sortiz.org>
7415
-
L: irda-users@lists.sourceforge.net (subscribers-only)
7416
-
L: netdev@vger.kernel.org
7417
-
W: http://irda.sourceforge.net/
7418
-
S: Obsolete
7419
-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
7420
-
F: Documentation/networking/irda.txt
7421
-
F: drivers/staging/irda/
7422
-
7423
7413
IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
7424
7414
M: Marc Zyngier <marc.zyngier@arm.com>
7425
7415
S: Maintained
+1
-1
drivers/staging/wilc1000/host_interface.c
+1
-1
drivers/staging/wilc1000/host_interface.c
-18
include/uapi/linux/sysctl.h
-18
include/uapi/linux/sysctl.h
···
780
780
NET_BRIDGE_NF_FILTER_PPPOE_TAGGED = 5,
781
781
};
782
782
783
-
/* proc/sys/net/irda */
784
-
enum {
785
-
NET_IRDA_DISCOVERY=1,
786
-
NET_IRDA_DEVNAME=2,
787
-
NET_IRDA_DEBUG=3,
788
-
NET_IRDA_FAST_POLL=4,
789
-
NET_IRDA_DISCOVERY_SLOTS=5,
790
-
NET_IRDA_DISCOVERY_TIMEOUT=6,
791
-
NET_IRDA_SLOT_TIMEOUT=7,
792
-
NET_IRDA_MAX_BAUD_RATE=8,
793
-
NET_IRDA_MIN_TX_TURN_TIME=9,
794
-
NET_IRDA_MAX_TX_DATA_SIZE=10,
795
-
NET_IRDA_MAX_TX_WINDOW=11,
796
-
NET_IRDA_MAX_NOREPLY_TIME=12,
797
-
NET_IRDA_WARN_NOREPLY_TIME=13,
798
-
NET_IRDA_LAP_KEEPALIVE_TIME=14,
799
-
};
800
-
801
783
802
784
/* CTL_FS names: */
803
785
enum
+1
-19
kernel/sysctl_binary.c
+1
-19
kernel/sysctl_binary.c
···
704
704
{}
705
705
};
706
706
707
-
static const struct bin_table bin_net_irda_table[] = {
708
-
{ CTL_INT, NET_IRDA_DISCOVERY, "discovery" },
709
-
{ CTL_STR, NET_IRDA_DEVNAME, "devname" },
710
-
{ CTL_INT, NET_IRDA_DEBUG, "debug" },
711
-
{ CTL_INT, NET_IRDA_FAST_POLL, "fast_poll_increase" },
712
-
{ CTL_INT, NET_IRDA_DISCOVERY_SLOTS, "discovery_slots" },
713
-
{ CTL_INT, NET_IRDA_DISCOVERY_TIMEOUT, "discovery_timeout" },
714
-
{ CTL_INT, NET_IRDA_SLOT_TIMEOUT, "slot_timeout" },
715
-
{ CTL_INT, NET_IRDA_MAX_BAUD_RATE, "max_baud_rate" },
716
-
{ CTL_INT, NET_IRDA_MIN_TX_TURN_TIME, "min_tx_turn_time" },
717
-
{ CTL_INT, NET_IRDA_MAX_TX_DATA_SIZE, "max_tx_data_size" },
718
-
{ CTL_INT, NET_IRDA_MAX_TX_WINDOW, "max_tx_window" },
719
-
{ CTL_INT, NET_IRDA_MAX_NOREPLY_TIME, "max_noreply_time" },
720
-
{ CTL_INT, NET_IRDA_WARN_NOREPLY_TIME, "warn_noreply_time" },
721
-
{ CTL_INT, NET_IRDA_LAP_KEEPALIVE_TIME, "lap_keepalive_time" },
722
-
{}
723
-
};
724
-
725
707
static const struct bin_table bin_net_table[] = {
726
708
{ CTL_DIR, NET_CORE, "core", bin_net_core_table },
727
709
/* NET_ETHER not used */
···
725
743
{ CTL_DIR, NET_LLC, "llc", bin_net_llc_table },
726
744
{ CTL_DIR, NET_NETFILTER, "netfilter", bin_net_netfilter_table },
727
745
/* NET_DCCP "dccp" no longer used */
728
-
{ CTL_DIR, NET_IRDA, "irda", bin_net_irda_table },
746
+
/* NET_IRDA "irda" no longer used */
729
747
{ CTL_INT, 2089, "nf_conntrack_max" },
730
748
{}
731
749
};