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
..
asm-generic	UPSTREAM: signal: define the SA_EXPOSE_TAGBITS bit in sa_flags	2021-01-22 10:05:52 -08:00
drm	drm/fourcc: fix Amlogic format modifier masks	2021-03-04 11:37:38 +01:00
linux	ANDROID: roll back xt_IDLETIMER to 5.10.21 upstream/vanilla version	2021-03-30 08:21:42 +00:00
misc	habanalabs: Add an option to map CB to device MMU	2020-09-22 18:49:54 +03:00
mtd	MTD: mtd-abi.h: drop a duplicated word	2020-08-02 23:00:10 +02:00
rdma	RDMA/vmw_pvrdma: Fix network_hdr_type reported in WC	2021-01-30 13:55:18 +01:00
scsi
sound	ALSA: fix kernel-doc markups	2020-10-26 15:26:31 +01:00
video
xen	xen/gntdev: gntdev.h: drop a duplicated word	2020-08-03 07:46:42 +02:00
Kbuild