summaryrefslogtreecommitdiff
path: root/trafgen.zsh
diff options
context:
space:
mode:
authorVadim Kochan <vadim4j@gmail.com>2015-10-29 06:08:24 +0200
committerTobias Klauser <tklauser@distanz.ch>2015-10-29 09:27:31 +0100
commitf863bc21719c99d09e2db8cad3ac6ac19ab43ef5 (patch)
treeb85c707688ad2eeb9e64002ee050d5ed58b626bf /trafgen.zsh
parent1eba05919fed6a72612ebf918eb92847e59c63df (diff)
flowtop: Fix missing --no-geoip option in usage output
Add G,--no-geoip to the usage output. Signed-off-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'trafgen.zsh')
0 files changed, 0 insertions, 0 deletions
3362fa47fe98b62e4a34ab408c4a418432e7939 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull namespace fixes from Eric Biederman: "This tree contains 4 fixes. The first is a fix for a race that can causes oopses under the right circumstances, and that someone just recently encountered. Past that are several small trivial correct fixes. A real issue that was blocking development of an out of tree driver, but does not appear to have caused any actual problems for in-tree code. A potential deadlock that was reported by lockdep. And a deadlock people have experienced and took the time to track down caused by a cleanup that removed the code to drop a reference count" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: sysctl: Drop reference added by grab_header in proc_sys_readdir pid: fix lockdep deadlock warning due to ucount_lock libfs: Modify mount_pseudo_xattr to be clear it is not a userspace mount mnt: Protect the mountpoint hashtable with mount_lock
Diffstat (limited to 'include/drm/drm_panel.h')