aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-04-12Merge "Update for kernel 6.8 headers." into mainHEADmastermainTreehugger Robot
2024-04-01Update for kernel 6.8 headers.Christopher Ferris
6.8 is dropping support for some networking features, and the uapi headers also have removed the corresponding defines/structures. Stop compiling these files which use those old features: f_rsvp.c, f_tcindex.c, q_cbq.c, q_dsmark.c. Test: Builds. Change-Id: I64ceccd60473d93b22aa61e548e1bf9026bc9d2d
2023-12-08Merge "macsec: fix off-by-one when parsing attributes" into main am: ↵Treehugger Robot
66962edd08 am: 63749e89a3 am: d99069a3ce am: 6ff49255af am: 6127343e06 am: 885ef55450 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2760365 Change-Id: Icc8c4988899c3100cc4070b5ff2c36d020b5d3d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Fix duplicate symbols error in external/iproute2" into main am: ↵Treehugger Robot
135e56a3ab am: 6b74b744d9 am: 57bc9af6c5 am: ced2110b77 am: f635494bf4 am: 8cead5523b Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2670015 Change-Id: I691020370c63e577e5cd4a48c71e9a6520cbc58f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Move OWNER reference master=>main." into main am: 352df531fe am: ↵Sam Saccone
8e41a11a80 am: da07c2434a am: 48ad6ccc29 am: a7bd8b3089 am: d0c218bac6 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2661146 Change-Id: I73851c8803a449a3d00288d4b12e592ac1dd16a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08[automerger skipped] [NFC] Move MTE mode settings to a product variable. am: ↵Evgenii Stepanov
55ba83ef49 am: bde4038d1a -s ours am: be34a375c9 -s ours am: a194d80c7d -s ours am skip reason: Merged-In I9b8b8551a92bd09e63448c60cbaf9bd505cd1b7d with SHA-1 55ba83ef49 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/23716200 Change-Id: I156daae487bce9ed729d6e69e5e7ada1c9451012 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08[automerger skipped] [NFC] Move MTE mode settings to a product variable. am: ↵Evgenii Stepanov
55ba83ef49 -s ours am: 6b12867846 -s ours am: e58d85c184 -s ours am: 230546a2dc -s ours am skip reason: Merged-In I9b8b8551a92bd09e63448c60cbaf9bd505cd1b7d with SHA-1 3e200849db is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/23716200 Change-Id: If7cb16cf3082ac96c6d1f516a515320773821d6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "[NFC] Move MTE mode settings to a product variable." am: 130fbe91c7 ↵Evgenii Stepanov
am: 28fd4d5aa4 am: e1cfd0a06a am: 2f59ba46ee am: 488cbf542c am: 245d210e65 am: 0a9aaf7e60 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2622659 Change-Id: I44038fcc5b8986fe428f9e2e7239ece344c089d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Specify which M4 to use with bison" am: 7ef9147ba8 am: 2fada47f73 am: ↵Maciej Żenczykowski
ea5cb79acb am: 831d27c1c8 am: 36f01fa231 am: de6b9a5bd2 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2566117 Change-Id: Iaacb1208fabd74a298534fc266e58cb517ff3538 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Editing the METADATA file of iproute2" am: 6365d10e84 am: 5951d657af ↵Sadaf Ebrahimi
am: 6fa8fe26ef am: e787700b5a am: b7999b9f78 am: 0f3d88ac3f Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2515761 Change-Id: Iea9e620a06b962431120ebfaa5e39534e0ef063d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Enable strdupa() for this project, build ip_bond*.c." am: b1b8b3b458 ↵Maciej Żenczykowski
am: ddb412aa21 am: 7065904ca0 am: a16dd6b4ec am: b1d7a34699 am: 0d4455c872 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2466013 Change-Id: Ieedab14b74713b1ac6860b40c32ff946d60cd21b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Generate static-syms.h at build time." am: 494234160c am: 204573a093 ↵Maciej Żenczykowski
am: b3abef6f6e am: b5fda916c6 am: 9c90a9fde9 am: f6260445dd Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2468220 Change-Id: I808f2f6ec1fd515cc9b0991e696312124c2dcaad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Stop checking in generated files." am: b57891f017 am: f33cc0bb35 am: ↵Maciej Żenczykowski
57856ed50e am: 7b00f3b496 am: cba86bfba9 am: 6625381596 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2465351 Change-Id: Id9b020f08049a4edf8c709d691cadfad9f0a3f79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "macsec: fix off-by-one when parsing attributes" into main am: ↵Treehugger Robot
66962edd08 am: 63749e89a3 am: d99069a3ce am: 6ff49255af am: 6127343e06 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2760365 Change-Id: Ifc40eb0ee4625439a7ebe4d6c645b00b9be5eed0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Fix duplicate symbols error in external/iproute2" into main am: ↵Treehugger Robot
135e56a3ab am: 6b74b744d9 am: 57bc9af6c5 am: ced2110b77 am: f635494bf4 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2670015 Change-Id: I2a822983b95e0b070e4d0e20111545102d151dee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Move OWNER reference master=>main." into main am: 352df531fe am: ↵Sam Saccone
8e41a11a80 am: da07c2434a am: 48ad6ccc29 am: a7bd8b3089 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2661146 Change-Id: Ib269302bc1d8bc4b67de9ea1b6c600940407dd7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08[automerger skipped] [NFC] Move MTE mode settings to a product variable. am: ↵Evgenii Stepanov
55ba83ef49 am: bde4038d1a -s ours am: be34a375c9 -s ours am skip reason: Merged-In I9b8b8551a92bd09e63448c60cbaf9bd505cd1b7d with SHA-1 55ba83ef49 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/23716200 Change-Id: I1ce03086f33091e6e0e1f22b59a85ff727f5932f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08[automerger skipped] [NFC] Move MTE mode settings to a product variable. am: ↵Evgenii Stepanov
55ba83ef49 -s ours am: 6b12867846 -s ours am: e58d85c184 -s ours am skip reason: Merged-In I9b8b8551a92bd09e63448c60cbaf9bd505cd1b7d with SHA-1 3e200849db is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/23716200 Change-Id: I3d9715619392b2e9d77d01cea32c1325de8cabb0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "[NFC] Move MTE mode settings to a product variable." am: 130fbe91c7 ↵Evgenii Stepanov
am: 28fd4d5aa4 am: e1cfd0a06a am: 2f59ba46ee am: 488cbf542c am: 245d210e65 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2622659 Change-Id: I6b1b34fa0298306590662644fe7839b372f410e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Specify which M4 to use with bison" am: 7ef9147ba8 am: 2fada47f73 am: ↵Maciej Żenczykowski
ea5cb79acb am: 831d27c1c8 am: 36f01fa231 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2566117 Change-Id: I884e659ddf2b406a2ff87d0df3923bdab2d4291a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Editing the METADATA file of iproute2" am: 6365d10e84 am: 5951d657af ↵Sadaf Ebrahimi
am: 6fa8fe26ef am: e787700b5a am: b7999b9f78 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2515761 Change-Id: Ibbc72d9b467e7948f101f3514f0b4f42ac9e2395 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Enable strdupa() for this project, build ip_bond*.c." am: b1b8b3b458 ↵Maciej Żenczykowski
am: ddb412aa21 am: 7065904ca0 am: a16dd6b4ec am: b1d7a34699 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2466013 Change-Id: Icf5078b90224962aee8d98e85c145fe1e2a61c8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Generate static-syms.h at build time." am: 494234160c am: 204573a093 ↵Maciej Żenczykowski
am: b3abef6f6e am: b5fda916c6 am: 9c90a9fde9 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2468220 Change-Id: I73d61e8bf11ab0ebe796190e6d1e7643178e1d2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Stop checking in generated files." am: b57891f017 am: f33cc0bb35 am: ↵Maciej Żenczykowski
57856ed50e am: 7b00f3b496 am: cba86bfba9 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2465351 Change-Id: Iddd68f0930c37cf619703255a951d8a3a7f99b0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20Merge remote-tracking branch 'aosp/main' into HEAD am: b69c7b025fMaciej Żenczykowski
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/25100832 Change-Id: I1cef00ed4c6ad2c9f89a3076b6384f31d456b660 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18[automerger skipped] Move OWNER reference master=>main. am: 41d4d25f0c -s oursSam Saccone
am skip reason: Merged-In I0b5483f81eaf4064101f125d0fffdfe56f8b3792 with SHA-1 9063cb88c9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/25093944 Change-Id: I6fffc875d9be7cf91c49dc1339c00802bd2c9900 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18Merge remote-tracking branch 'aosp/main' into HEADMaciej Żenczykowski
* aosp/main: macsec: fix off-by-one when parsing attributes Fix duplicate symbols error in external/iproute2 Move OWNER reference master=>main. [NFC] Move MTE mode settings to a product variable. Specify which M4 to use with bison Ignore-AOSP-First: this is a merge from AOSP Bug: 305814576 Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ib548ce5bdc796d3efe8c462546bab0a02732da4b
2023-10-17Move OWNER reference master=>main.Sam Saccone
BUG=b/291759353 (cherry picked from https://android-review.googlesource.com/q/commit:9063cb88c9a87b9c89c212ab1d5b2d09ea1cdc20) Merged-In: I0b5483f81eaf4064101f125d0fffdfe56f8b3792 Change-Id: I0b5483f81eaf4064101f125d0fffdfe56f8b3792
2023-09-26Merge "macsec: fix off-by-one when parsing attributes" into main am: ↵Treehugger Robot
66962edd08 am: 63749e89a3 am: d99069a3ce am: 6ff49255af am: 6127343e06 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2760365 Change-Id: I7117f3a1aefbd1ad1e27de9aaf6512a32f9e7e6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26Merge "macsec: fix off-by-one when parsing attributes" into main am: ↵android-u-qpr3-beta-1-gplandroid-u-qpr2-beta-2-gplTreehugger Robot
66962edd08 am: 63749e89a3 am: d99069a3ce am: 6ff49255af Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2760365 Change-Id: Ia56718bb120cdd4df3faa7ec7e78042b0b8284fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26Merge "macsec: fix off-by-one when parsing attributes" into main am: ↵Treehugger Robot
66962edd08 am: 63749e89a3 am: d99069a3ce Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2760365 Change-Id: I890753241f2e0db88301d0d88979df4a0396040c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "macsec: fix off-by-one when parsing attributes" into main am: ↵Treehugger Robot
66962edd08 am: 63749e89a3 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2760365 Change-Id: Ifa219027c36d27c09b77382ea164248ead79f0a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "macsec: fix off-by-one when parsing attributes" into main am: 66962edd08android-u-rb-dp-10-gplandroid-u-rb-dp-10-gplTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2760365 Change-Id: Ia278fdf254b130df22fa3747454e2b2fc011fd15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "macsec: fix off-by-one when parsing attributes" into mainTreehugger Robot
2023-09-24macsec: fix off-by-one when parsing attributesSabrina Dubroca
I seem to have had a massive brainfart with uses of parse_rtattr_nested(). The rtattr* array must have MAX+1 elements, and the call to parse_rtattr_nested must have MAX as its bound. Let's fix those. Fixes: b26fc590ce62 ("ip: add MACsec support") Signed-off-by: Sabrina Dubroca <sd@queasysnail.net> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Bug: 299660996 (cherry picked from commit https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=9b45f8ec13b0d338c70ef0758f751c249be6c7f0) Change-Id: I4b892fdaf953959a5f98fbb99d1693a7006e5820
2023-07-25Merge "Fix duplicate symbols error in external/iproute2" into main am: ↵Treehugger Robot
135e56a3ab am: 6b74b744d9 am: 57bc9af6c5 am: ced2110b77 am: f635494bf4 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2670015 Change-Id: I31b5b421933bc442422ba47f4b7919dfa198c2d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Merge "Fix duplicate symbols error in external/iproute2" into main am: ↵Treehugger Robot
135e56a3ab am: 6b74b744d9 am: 57bc9af6c5 am: ced2110b77 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2670015 Change-Id: I5e1ba5baa2edd7602732e287407eea6f0f66ccca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Merge "Fix duplicate symbols error in external/iproute2" into main am: ↵Treehugger Robot
135e56a3ab am: 6b74b744d9 am: 57bc9af6c5 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2670015 Change-Id: I3de9c2bbdb6edf5c0a1520afeb760d45ea386ce2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Merge "Fix duplicate symbols error in external/iproute2" into main am: ↵Treehugger Robot
135e56a3ab am: 6b74b744d9 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2670015 Change-Id: I6bef9b985bcfd497b051d75f1e9e7014e8ba6ab3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Merge "Fix duplicate symbols error in external/iproute2" into main am: ↵Treehugger Robot
135e56a3ab Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2670015 Change-Id: I0fae2c449af16af3094bfee24c7dd0c1a6ce8777 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Merge "Fix duplicate symbols error in external/iproute2" into mainTreehugger Robot
2023-07-24Fix duplicate symbols error in external/iproute2zijunzhao
Symbol filter and listen_all_nsid are duplicate when switch -fcommon to -fno-common. Keep the old default for this project until we get a fixed version from upstream. Upstream fix patch: https://github.com/shemminger/iproute2/commit/578cadcc68035943062d74507c3b7989741b353f https://github.com/shemminger/iproute2/commit/fa92d8cb09e6a254d26834a66e4645ece6662f1a Bug: b/151457797 Test: mm Change-Id: I916bb676f179354918d63b40175eebfcb3714513
2023-07-18Merge "Move OWNER reference master=>main." into main am: 352df531fe am: ↵Sam Saccone
8e41a11a80 am: da07c2434a am: 48ad6ccc29 am: a7bd8b3089 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2661146 Change-Id: I3120b2b172b1dcbb46afc85f244d2f8559aac430 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: 352df531fe am: ↵Sam Saccone
8e41a11a80 am: da07c2434a am: 48ad6ccc29 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2661146 Change-Id: Ia39e02327ac3a007ae75494c1f69e7d71e6c27d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: 352df531fe am: ↵Sam Saccone
8e41a11a80 am: da07c2434a Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2661146 Change-Id: I06169876854f934a3c8c8f52c1028c01a7d4442e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: 352df531fe am: ↵Sam Saccone
8e41a11a80 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2661146 Change-Id: I94f744508beeea46b976485257058cf3608c9627 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: 352df531feSam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2661146 Change-Id: Ic4c4683ae76de7b75d624fddbda8798ed484cea8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into mainSam Saccone
2023-07-18Move OWNER reference master=>main.Sam Saccone
BUG=b/291759353 Change-Id: I0b5483f81eaf4064101f125d0fffdfe56f8b3792
2023-06-16[automerger skipped] [NFC] Move MTE mode settings to a product variable. am: ↵Evgenii Stepanov
55ba83ef49 am: bde4038d1a -s ours am: be34a375c9 -s ours am skip reason: Merged-In I9b8b8551a92bd09e63448c60cbaf9bd505cd1b7d with SHA-1 55ba83ef49 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/23716200 Change-Id: I18cf8b2e70f354b10830207593450215cb816b24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 16:04:27 +0000