From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Jun 2020 23:05:54 +0000 (-0700)
Subject: Merge branch 'work.sysctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: v5.10.7~2359
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c3837266214c1e6fbbb96ff36bee13e923057d8;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'work.sysctl' of git://git./linux/kernel/git/viro/vfs

Pull sysctl fixes from Al Viro:
 "Fixups to regressions in sysctl series"

* 'work.sysctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  sysctl: reject gigantic reads/write to sysctl files
  cdrom: fix an incorrect __user annotation on cdrom_sysctl_info
  trace: fix an incorrect __user annotation on stack_trace_sysctl
  random: fix an incorrect __user annotation on proc_do_entropy
  net/sysctl: remove leftover __user annotations on neigh_proc_dointvec*
  net/sysctl: use cpumask_parse in flow_limit_cpu_sysctl
---

1c3837266214c1e6fbbb96ff36bee13e923057d8