This fixes up a merge issue with the amba-pl011.c driver, and we want the fixes in this branch as well.
Showing the changes to include/uapi (3 of 501 files). Show all
Unified · Split
| @@ -42,6 +42,9 @@ enum tcp_conntrack { · 41 unmodified lines | |||
| 42 | /* The field td_maxack has been set */ | 42 | /* The field td_maxack has been set */ |
| 43 | #define IP_CT_TCP_FLAG_MAXACK_SET 0x20 | 43 | #define IP_CT_TCP_FLAG_MAXACK_SET 0x20 |
| 44 | 44 | ||
| 45 | /* Marks possibility for expected RFC5961 challenge ACK */ | ||
| 46 | #define IP_CT_EXP_CHALLENGE_ACK 0x40 | ||
| 47 | |||
| 45 | struct nf_ct_tcp_flags { | 48 | struct nf_ct_tcp_flags { |
| 46 | __u8 flags; | 49 | __u8 flags; |
| 47 | __u8 mask; | 50 | __u8 mask; |
| @@ -337,7 +337,7 @@ struct rtnexthop { · 336 unmodified lines | |||
| 337 | #define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath) */ | 337 | #define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath) */ |
| 338 | #define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */ | 338 | #define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */ |
| 339 | #define RTNH_F_ONLINK 4 /* Gateway is forced on link */ | 339 | #define RTNH_F_ONLINK 4 /* Gateway is forced on link */ |
| 340 | #define RTNH_F_EXTERNAL 8 /* Route installed externally */ | 340 | #define RTNH_F_OFFLOAD 8 /* offloaded route */ |
| 341 | 341 | ||
| 342 | /* Macros to handle hexthops */ | 342 | /* Macros to handle hexthops */ |
| 343 | 343 | ||
| @@ -26,6 +26,7 @@ · 25 unmodified lines | |||
| 26 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 26 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| 27 | * SUCH DAMAGE. */ | 27 | * SUCH DAMAGE. */ |
| 28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 29 | #include <linux/virtio_types.h> | ||
| 29 | #include <linux/virtio_ids.h> | 30 | #include <linux/virtio_ids.h> |
| 30 | #include <linux/virtio_config.h> | 31 | #include <linux/virtio_config.h> |
| 31 | 32 | ||