Maciej Żenczykowski ee6918c6f7
ANDROID: roll back xt_IDLETIMER to 5.10.21 upstream/vanilla version ...
Conflict resolution was done incorrectly and needs to be redone.
(the registration passes in two different revision one blocks,
instead of one rev zero, and one rev one, it also erroneously changes
upstream uapi)
Generated via:
git cat-file -p remotes/linux-stable/v5.10.21:net/netfilter/xt_IDLETIMER.c > net/netfilter/xt_IDLETIMER.c
git cat-file -p remotes/linux-stable/v5.10.21:include/uapi/linux/netfilter/xt_IDLETIMER.h > include/uapi/linux/netfilter/xt_IDLETIMER.h
Test: builds, and kernel net tests passes
Bug: 183485987
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I33823ddbd139dc7a435388d22ae76966d2bdd2a7
2021-03-30 08:21:42 +00:00
2021-03-24 14:53:36 +00:00
2020-07-15 20:34:11 -07:00
2020-10-12 10:06:08 +02:00
2020-08-22 10:53:12 +01:00
2021-03-30 08:21:42 +00:00
2020-07-21 22:05:32 -07:00
2020-06-15 16:03:38 +01:00
2020-10-03 17:28:45 -07:00
2021-01-20 16:05:59 +01:00
2020-07-13 17:01:44 -07:00
2020-07-21 11:21:44 -04:00
2020-08-12 10:58:00 -07:00
2020-06-26 10:36:30 +02:00
2020-06-26 10:37:11 +02:00
2021-01-12 20:18:25 +01:00
2020-10-09 12:47:02 -06:00
2020-12-11 14:19:07 -08:00
2020-10-07 12:13:23 +02:00
2020-07-27 12:55:43 +02:00
2020-10-24 17:30:14 +02:00
2020-10-02 17:58:52 -06:00
2020-06-17 00:07:38 +02:00
2021-01-06 14:56:51 +01:00
2020-09-17 18:46:04 +02:00
2020-12-30 11:53:58 +01:00
2021-02-19 10:48:51 +00:00
2020-12-10 15:24:57 -08:00
2020-09-10 09:10:06 +02:00
2020-09-04 12:46:07 +01:00
2020-07-19 19:20:22 -07:00
2020-09-22 16:45:34 -07:00
2021-01-06 14:56:51 +01:00
2020-12-21 13:33:17 -08:00
2020-07-27 23:24:00 +02:00
2020-06-24 21:34:11 +02:00
2020-06-05 16:19:28 -07:00
2020-07-06 21:37:08 -07:00
2020-12-28 14:49:38 -08:00
2021-02-22 09:32:56 -08:00
2021-01-30 10:28:59 +00:00
2020-10-03 14:18:29 -07:00
2020-06-05 20:19:20 +02:00
2020-10-28 15:46:47 +01:00
2020-08-27 08:01:47 -07:00
2020-07-27 12:20:40 -07:00
2020-07-23 17:55:20 +00:00
2020-07-19 19:20:22 -07:00
2020-10-31 13:16:02 -07:00
2020-08-05 19:02:07 +05:30
2020-12-26 16:02:45 +01:00
2020-09-23 13:24:34 -07:00
2020-09-17 17:58:13 -07:00
2020-08-22 12:44:37 -07:00
2020-07-13 15:32:56 -07:00
2020-07-24 17:12:41 -07:00
2020-08-27 07:55:59 -07:00
2021-03-01 16:15:46 +00:00
2020-09-03 15:17:28 -07:00
2020-09-08 16:31:14 -07:00
2020-09-30 20:32:33 -06:00
2020-10-01 14:52:46 +02:00
2020-09-15 09:57:45 -05:00
2020-07-27 16:34:12 +03:00
2021-01-06 14:56:51 +01:00
2020-08-31 14:40:29 -04:00
2020-10-21 17:36:32 -04:00
2021-03-17 17:06:11 +01:00
2021-01-06 14:56:51 +01:00
2020-08-12 10:57:59 -07:00
2020-07-19 18:05:49 -07:00
2020-08-18 15:44:44 +02:00
2020-09-25 14:23:27 +02:00
2020-09-15 22:13:31 +10:00
2020-08-27 16:06:47 -04:00
2020-07-09 12:38:41 -07:00
2021-01-06 14:56:51 +01:00
2020-09-10 12:25:51 -07:00
2020-07-14 13:46:42 -07:00
2020-07-25 19:34:47 -06:00
2020-06-24 14:36:33 -07:00
2020-10-14 20:28:05 -07:00
2021-01-06 14:56:51 +01:00
2020-10-16 09:28:43 -04:00
2020-07-13 17:52:46 -04:00
2020-10-02 09:37:41 -04:00
2020-09-22 13:58:40 +02:00
2021-02-05 10:54:25 +00:00
2020-11-27 11:03:06 -08:00
2020-10-21 09:58:39 -05:00
2021-03-01 12:52:13 -08:00
2020-09-04 12:34:50 +02:00
2021-03-07 12:34:07 +01:00
2020-06-29 17:08:28 -07:00
2020-10-20 19:15:03 +02:00
2020-07-19 19:22:56 -07:00
2020-12-21 13:30:06 +01:00
2020-07-10 14:50:51 +02:00
2020-06-25 16:26:25 -07:00
2020-08-04 20:16:37 -07:00
2021-02-03 23:28:43 +01:00
2020-07-02 14:19:15 -07:00
2020-10-05 16:35:57 +01:00
2020-07-14 16:29:42 -07:00
2020-08-03 17:57:40 -07:00
2020-07-06 14:06:08 +02:00
2020-09-24 20:15:45 -07:00
2020-12-03 10:03:14 -08:00
2021-01-06 14:56:51 +01:00
2020-07-28 22:25:30 -04:00
2020-07-31 17:00:44 -07:00
2020-08-21 08:55:13 +02:00
2020-07-07 15:55:21 +02:00
2020-09-18 13:58:37 -07:00
2020-09-18 13:58:37 -07:00
2020-08-12 10:57:59 -07:00
2021-02-05 13:14:00 +00:00
2021-03-02 01:43:47 +00:00
2020-09-26 10:22:29 +02:00
2021-01-30 13:55:18 +01:00
2020-07-10 13:45:32 +02:00
2020-07-10 13:45:32 +02:00
2020-10-07 14:23:44 -06:00
2020-10-12 11:41:02 -06:00
2020-10-23 11:55:28 -04:00
2020-10-23 11:55:28 -04:00
2020-10-23 12:01:26 +02:00
2020-08-05 09:30:19 -04:00
2020-08-05 09:30:20 -04:00
2020-08-05 11:08:39 -04:00
2020-08-03 16:11:42 -04:00
2020-08-05 11:08:39 -04:00
2020-08-05 11:08:39 -04:00
2020-09-10 11:39:22 +02:00
2020-08-18 14:14:25 +02:00
2020-08-05 11:08:40 -04:00
2020-08-05 11:08:40 -04:00
2020-08-05 11:08:40 -04:00
2020-09-10 10:05:58 +02:00
2020-08-05 11:08:41 -04:00
2020-09-10 10:05:58 +02:00
2020-08-05 11:08:40 -04:00
2020-08-05 11:08:40 -04:00
2020-07-31 09:24:23 +02:00
2020-06-27 09:48:57 +02:00
2020-07-13 15:32:56 -07:00
2020-06-24 07:51:01 +02:00
ee6918c6f7