summaryrefslogtreecommitdiff
path: root/tstamping.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2020-08-19 12:04:47 +0200
committerTobias Klauser <tobias.klauser@gmail.com>2020-08-19 13:16:51 +0200
commit0d5aa3246c20dad2d76165559fb575136b7216e8 (patch)
treec2795e739e5cc9969e3896200db7fe036921a917 /tstamping.c
parentbfa3c89317869ffe1e90b7e01e7cacad7a7ea10e (diff)
mausezahn: move variable definitions cli.h to cli.c
Move variable definitions to avoid "multiple definition of symbol" linker errors with gcc-10. Updates #216 Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'tstamping.c')
0 files changed, 0 insertions, 0 deletions
x/net-next.git/diff/sound/soc/intel/skylake/skl-nhlt.c?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/soc/intel/skylake/skl-nhlt.c')