net/sched/cls_api.c has overlapping changes to a call to nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL to the 5th argument, and another (from 'net-next') added cb->extack instead of NULL to the 6th argument. net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to code which moved (to mr_table_dump)) in 'net-next'. Thanks to David Ahern for the heads up.
Showing the changes to include/uapi/linux (1 of 114 files). Show all
Unified · Split
| @@ -301,6 +301,7 @@ enum sctp_sinfo_flags { · 300 unmodified lines | ||
| 301 | 301 | SCTP_SACK_IMMEDIATELY = (1 << 3), /* SACK should be sent without delay. */ |
| 302 | 302 | /* 2 bits here have been used by SCTP_PR_SCTP_MASK */ |
| 303 | 303 | SCTP_SENDALL = (1 << 6), |
| 304 | + SCTP_PR_SCTP_ALL = (1 << 7), | |
| 304 | 305 | SCTP_NOTIFICATION = MSG_NOTIFICATION, /* Next message is not user msg but notification. */ |
| 305 | 306 | SCTP_EOF = MSG_FIN, /* Initiate graceful shutdown process. */ |
| 306 | 307 | }; |