Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
This commit is contained in:
@@ -987,7 +987,7 @@ struct sctp_transport {
|
||||
int init_sent_count;
|
||||
|
||||
/* state : The current state of this destination,
|
||||
* : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKOWN.
|
||||
* : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKNOWN.
|
||||
*/
|
||||
int state;
|
||||
|
||||
|
||||
+1
-1
@@ -1260,7 +1260,7 @@ static inline struct sk_buff *tcp_write_queue_prev(struct sock *sk, struct sk_bu
|
||||
skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp)
|
||||
|
||||
/* This function calculates a "timeout" which is equivalent to the timeout of a
|
||||
* TCP connection after "boundary" unsucessful, exponentially backed-off
|
||||
* TCP connection after "boundary" unsuccessful, exponentially backed-off
|
||||
* retransmissions with an initial RTO of TCP_RTO_MIN.
|
||||
*/
|
||||
static inline bool retransmits_timed_out(const struct sock *sk,
|
||||
|
||||
+1
-1
@@ -79,7 +79,7 @@
|
||||
* drivers have to only report state changes due to external
|
||||
* conditions.
|
||||
*
|
||||
* All API operations are 'atomic', serialized thorough a mutex in the
|
||||
* All API operations are 'atomic', serialized through a mutex in the
|
||||
* `struct wimax_dev`.
|
||||
*
|
||||
* EXPORTING TO USER SPACE THROUGH GENERIC NETLINK
|
||||
|
||||
Reference in New Issue
Block a user