aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "ANDROID: do not leak memory in iptables-restore"HEADmasterMaciej Żenczykowski2020-09-171-0/+2
|\
| * ANDROID: do not leak memory in iptables-restoreMaciej Żenczykowski2020-09-171-0/+2
|/
* [automerger skipped] use __BIONIC__ not __ANDROID__ am: 48f5cbdd1c -s oursTreehugger Robot2020-05-110-0/+0
|\
| * use __BIONIC__ not __ANDROID__android11-devTreehugger Robot2020-05-112-2/+2
* | Merge "use __BIONIC__ not __ANDROID__" am: abe911e5f6 am: 5858660f64Treehugger Robot2020-05-112-2/+2
|\ \
| * \ Merge "use __BIONIC__ not __ANDROID__" am: abe911e5f6Treehugger Robot2020-05-112-2/+2
| |\ \
| | * \ Merge "use __BIONIC__ not __ANDROID__"Treehugger Robot2020-05-112-2/+2
| | |\ \
| | | * | use __BIONIC__ not __ANDROID__Maciej Żenczykowski2020-05-102-2/+2
| | |/ /
* | | | [automerger skipped] libxt_quota - remove spurious divergence from upstream a...Treehugger Robot2020-04-230-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | libxt_quota - remove spurious divergence from upstreamTreehugger Robot2020-04-231-1/+0
* | | | Merge "libxt_quota - remove spurious divergence from upstream" am: e6cb0500d4...Treehugger Robot2020-04-231-1/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "libxt_quota - remove spurious divergence from upstream" am: e6cb0500d4Treehugger Robot2020-04-231-1/+0
| |\ \ \ | | | |/ | | |/|
| | * | Merge "libxt_quota - remove spurious divergence from upstream"Treehugger Robot2020-04-231-1/+0
| | |\ \
| | | * | libxt_quota - remove spurious divergence from upstreamMaciej Żenczykowski2020-04-211-1/+0
| | |/ /
* | | | [automerger skipped] libiptc.c: remove ipt_error_target am: 7628ec22c1 -s oursMaciej Żenczykowski2020-04-210-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | libiptc.c: remove ipt_error_targetMaciej Żenczykowski2020-04-211-7/+0
* | | | [automerger skipped] UPSTREAM: iptables: open eBPF programs in read only mode...Maciej Żenczykowski2020-04-210-0/+0
|\| | |
| * | | UPSTREAM: iptables: open eBPF programs in read only modeMaciej Żenczykowski2020-04-211-7/+19
* | | | Merge "libiptc.c: remove ipt_error_target" am: 19b95eaa58 am: c9b64f3f49Maciej Żenczykowski2020-04-211-7/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "libiptc.c: remove ipt_error_target" am: 19b95eaa58Maciej Żenczykowski2020-04-211-7/+0
| |\ \ \ | | | |/ | | |/|
| | * | Merge "libiptc.c: remove ipt_error_target"Maciej Żenczykowski2020-04-211-7/+0
| | |\ \
| | | * | libiptc.c: remove ipt_error_targetMaciej Żenczykowski2020-04-211-7/+0
| | |/ /
* | | | Merge "UPSTREAM: iptables: open eBPF programs in read only mode" am: 87dcb9c3...Maciej Żenczykowski2020-04-211-7/+19
|\| | |
| * | | Merge "UPSTREAM: iptables: open eBPF programs in read only mode" am: 87dcb9c3c6Maciej Żenczykowski2020-04-211-7/+19
| |\| |
| | * | Merge "UPSTREAM: iptables: open eBPF programs in read only mode"Maciej Żenczykowski2020-04-211-7/+19
| | |\ \
| | | * | UPSTREAM: iptables: open eBPF programs in read only modeMaciej Żenczykowski2020-04-201-7/+19
| | |/ /
* | | | [automerger skipped] switch from README.version to METADATA am: d3c89663bf -s...Treehugger Robot2020-04-160-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | switch from README.version to METADATATreehugger Robot2020-04-162-3/+17
* | | | Merge "switch from README.version to METADATA" am: ec80498ac0 am: a497284aefTreehugger Robot2020-04-162-3/+17
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "switch from README.version to METADATA" am: ec80498ac0Treehugger Robot2020-04-162-3/+17
| |\ \ \ | | | |/ | | |/|
| | * | Merge "switch from README.version to METADATA"Treehugger Robot2020-04-162-3/+17
| | |\ \
| | | * | switch from README.version to METADATAMaciej Żenczykowski2020-04-162-3/+17
| | |/ /
* | | | merge of aosp master upgrade of iptables to 1.8.4 am: 64baf79cceMaciej Żenczykowski2020-04-160-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge of aosp master upgrade of iptables to 1.8.4Maciej Żenczykowski2020-04-16265-8195/+19691
| |\ \ \
* | \ \ \ Merge changes I59adf23d,I701fed5a,Ie86053f8,If2fb190b,I484066b0, ... am: 80ae...Treehugger Robot2020-04-16265-8195/+19691
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge changes I59adf23d,I701fed5a,Ie86053f8,If2fb190b,I484066b0, ... am: 80ae...Treehugger Robot2020-04-16265-8195/+19691
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge changes I59adf23d,I701fed5a,Ie86053f8,If2fb190b,I484066b0, ...Treehugger Robot2020-04-16265-8195/+19691
| | |\ \ \ | | | | |/ | | | |/|
| | | * | xt_IDLETIMER.h - remove spurious diffsMaciej Żenczykowski2020-04-161-5/+0
| | | * | remove spurious newline at EOF in OWNERSMaciej Żenczykowski2020-04-161-1/+0
| | | * | merge ip6tables binary into iptablesMaciej Żenczykowski2020-04-161-28/+5
| | | * | make it buildMaciej Żenczykowski2020-04-161-3/+3
| | | * | update .gitignore to match upstreamMaciej Żenczykowski2020-04-161-5/+1
| | | * | regenerate config.hMaciej Żenczykowski2020-04-161-12/+8
| | | * | README.version - set Version: 1.8.4Maciej Żenczykowski2020-04-161-1/+1
| | | * | iptables: flush stdout after every verbose log.Narayan Kamath2020-04-162-2/+6
| | | * | Merge tag 'v1.8.4' of git://git.netfilter.org/iptables into workMaciej Żenczykowski2020-04-0876-3049/+3926
| | | |\ \
| | | | * | configure: bump version for 1.8.4 releasePablo Neira Ayuso2019-12-021-1/+1
| | | | * | nft: bridge: Rudimental among extension supportPhil Sutter2019-11-257-31/+710
| | | | * | nft: Support parsing lookup expressionPhil Sutter2019-11-253-1/+13
| | | | * | nft: Embed rule's table name in nft_xt_ctxPhil Sutter2019-11-252-0/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 15:04:39 +0000