{"payload":{"feedbackUrl":"https://github.com/orgs/community/discussions/53140","repo":{"id":654730582,"defaultBranch":"main","name":"mptcp-upstream-rr-cache","ownerLogin":"multipath-tcp","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2023-06-16T20:06:55.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/2630482?v=4","public":true,"private":false,"isOrgOwned":true},"refInfo":{"name":"","listCacheKey":"v0:1686946256.401984","currentOid":""},"activityList":{"items":[{"before":"53fc4402a020d66a1c2f62055d554a9f46d1eb90","after":"9201dff92c491b5fed940eeed9a4da94f8a5d67b","ref":"refs/heads/main","pushedAt":"2024-04-30T08:38:42.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"matttbe","name":"Matthieu Baerts","path":"/matttbe","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/768677?s=80&v=4"},"commit":{"message":"previous conflicts, already resolved in linux-next\n\nSigned-off-by: Matthieu Baerts (NGI0) ","shortMessageHtmlLink":"previous conflicts, already resolved in linux-next"}},{"before":"e63f34f8b0f32b43138a19ec56a506a202c877cc","after":"53fc4402a020d66a1c2f62055d554a9f46d1eb90","ref":"refs/heads/main","pushedAt":"2024-04-02T08:53:13.000Z","pushType":"push","commitsCount":10,"pusher":{"login":"matttbe","name":"Matthieu Baerts","path":"/matttbe","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/768677?s=80&v=4"},"commit":{"message":"previous conflicts, already resolved in linux-next\n\nSigned-off-by: Matthieu Baerts (NGI0) ","shortMessageHtmlLink":"previous conflicts, already resolved in linux-next"}},{"before":"06162c50bd32a0c95e1857ab72faf18f66d788ee","after":"e63f34f8b0f32b43138a19ec56a506a202c877cc","ref":"refs/heads/main","pushedAt":"2023-08-21T11:51:30.000Z","pushType":"push","commitsCount":6,"pusher":{"login":"matttbe","name":"Matthieu Baerts","path":"/matttbe","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/768677?s=80&v=4"},"commit":{"message":"conflict in include/net/inet_sock.h\n\nThe fix is similar to the one of Stephen [1] except that the new\n'inet_id' field is put after 'inet_opt' to avoid a 4 bytes hole\n\nlinux-next version:\n\n struct inet_sock {\n struct sock sk __attribute__((__aligned__(8))); /* 0 768 */\n /* --- cacheline 12 boundary (768 bytes) --- */\n struct ipv6_pinfo * pinet6; /* 768 8 */\n long unsigned int inet_flags; /* 776 8 */\n __be32 inet_saddr; /* 784 4 */\n __s16 uc_ttl; /* 788 2 */\n __be16 inet_sport; /* 790 2 */\n atomic_t inet_id; /* 792 4 */\n\n /* XXX 4 bytes hole, try to pack */\n\n struct ip_options_rcu * inet_opt; /* 800 8 */\n __u8 tos; /* 808 1 */\n __u8 min_ttl; /* 809 1 */\n __u8 mc_ttl; /* 810 1 */\n __u8 pmtudisc; /* 811 1 */\n __u8 rcv_tos; /* 812 1 */\n __u8 convert_csum; /* 813 1 */\n\n /* XXX 2 bytes hole, try to pack */\n\n int uc_index; /* 816 4 */\n int mc_index; /* 820 4 */\n __be32 mc_addr; /* 824 4 */\n (...)\n\nThe proposed version here:\n\n struct inet_sock {\n struct sock sk __attribute__((__aligned__(8))); /* 0 768 */\n /* --- cacheline 12 boundary (768 bytes) --- */\n struct ipv6_pinfo * pinet6; /* 768 8 */\n long unsigned int inet_flags; /* 776 8 */\n __be32 inet_saddr; /* 784 4 */\n __s16 uc_ttl; /* 788 2 */\n __be16 inet_sport; /* 790 2 */\n struct ip_options_rcu * inet_opt; /* 792 8 */\n atomic_t inet_id; /* 800 4 */\n __u8 tos; /* 804 1 */\n __u8 min_ttl; /* 805 1 */\n __u8 mc_ttl; /* 806 1 */\n __u8 pmtudisc; /* 807 1 */\n __u8 rcv_tos; /* 808 1 */\n __u8 convert_csum; /* 809 1 */\n\n /* XXX 2 bytes hole, try to pack */\n\n int uc_index; /* 812 4 */\n int mc_index; /* 816 4 */\n __be32 mc_addr; /* 820 4 */\n (...)\n\nLink: https://lore.kernel.org/r/20230821110633.432a1599@canb.auug.org.au [1]\nSigned-off-by: Matthieu Baerts ","shortMessageHtmlLink":"conflict in include/net/inet_sock.h"}},{"before":"b0f130f3f0fb521145aec7eba8e922fba01d96be","after":"06162c50bd32a0c95e1857ab72faf18f66d788ee","ref":"refs/heads/main","pushedAt":"2023-07-30T07:35:54.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"matttbe","name":"Matthieu Baerts","path":"/matttbe","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/768677?s=80&v=4"},"commit":{"message":"conflicts in net/xdp/xsk.c\n\nTrivial context-based conflict, I took the modifications of the two\nversions.\n\nSigned-off-by: Matthieu Baerts ","shortMessageHtmlLink":"conflicts in net/xdp/xsk.c"}},{"before":"5091dddf4666f260ccb48da24f879aed129af62c","after":"b0f130f3f0fb521145aec7eba8e922fba01d96be","ref":"refs/heads/main","pushedAt":"2023-07-28T09:31:19.000Z","pushType":"push","commitsCount":2,"pusher":{"login":"matttbe","name":"Matthieu Baerts","path":"/matttbe","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/768677?s=80&v=4"},"commit":{"message":"conflicts in net/dsa/port.c\n\nI took the modif from both sides: one removing lines above and one\nadding new ones (+ adding '{' after the 'if' causing the conflict).\n\nSigned-off-by: Matthieu Baerts ","shortMessageHtmlLink":"conflicts in net/dsa/port.c"}},{"before":null,"after":"5091dddf4666f260ccb48da24f879aed129af62c","ref":"refs/heads/main","pushedAt":"2023-06-16T20:10:56.401Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"matttbe","name":"Matthieu Baerts","path":"/matttbe","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/768677?s=80&v=4"},"commit":{"message":"conflicts in tools/testing/selftests/net/fcnal-test.sh\n\nI took the modifications from both sides.\n\nSigned-off-by: Matthieu Baerts ","shortMessageHtmlLink":"conflicts in tools/testing/selftests/net/fcnal-test.sh"}}],"hasNextPage":false,"hasPreviousPage":false,"activityType":"all","actor":null,"timePeriod":"all","sort":"DESC","perPage":30,"cursor":"djE6ks8AAAAEPcbxTwA","startCursor":null,"endCursor":null}},"title":"Activity ยท multipath-tcp/mptcp-upstream-rr-cache"}