| Message ID | 20210212124458.3d008bb5@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the net tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc include/uapi/linux/pkt_cls.h index 88f4bf0047e7,afe6836e44b1..000000000000 --- a/include/uapi/linux/pkt_cls.h
Hi all, Today's linux-next merge of the net-next tree got a conflict in: include/uapi/linux/pkt_cls.h between commit: 1bcc51ac0731 ("net/sched: cls_flower: Reject invalid ct_state flags rules") from the net tree and commits: 7baf2429a1a9 ("net/sched: cls_flower add CT_FLAGS_INVALID flag support") 8c85d18ce647 ("net/sched: cls_flower: Add match on the ct_state reply flag") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.