#!/bin/sh if [ $# -eq 1 ] ; then OUTPUT=$1 fi GVF=${OUTPUT}PERF-VERSION-FILE LF=' ' # # First check if there is a .git to get the version from git describe # otherwise try to get the version from the kernel Makefile # CID= TAG= if test -d ../../.git -o -f ../../.git then TAG=$(git describe --abbrev=0 --match "v[0-9].[0-9]*" 2>/dev/null ) CID=$(git log -1 --abbrev=4 --pretty=format:"%h" 2>/dev/null) && CID="-g$CID" elif test -f ../../PERF-VERSION-FILE then TAG=$(cut -d' ' -f3 ../../PERF-VERSION-FILE | sed -e 's/\"//g') fi if test -z "$TAG" then TAG=$(MAKEFLAGS= make -sC ../.. kernelversion) fi VN="$TAG$CID" if test -n "$CID" then # format version string, strip trailing zero of sublevel: VN=$(echo "$VN" | sed -e 's/-/./g;s/\([0-9]*[.][0-9]*\)[.]0/\1/') fi VN=$(expr "$VN" : v*'\(.*\)') if test -r $GVF then VC=$(sed -e 's/^#define PERF_VERSION "\(.*\)"/\1/' <$GVF) else VC=unset fi test "$VN" = "$VC" || { echo >&2 " PERF_VERSION = $VN" echo "#define PERF_VERSION \"$VN\"" >$GVF } me='h' onchange='this.form.submit();'> net-next plumbingsTobias Klauser
summaryrefslogtreecommitdiff
path: root/sound/soc/intel/atom
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-18 10:47:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-18 10:47:11 -0800
commit49b550fee80b5f36b961640666f7945d7ec63000 (patch)
tree3dd2539f7168f8763c3ac9744234893c92d56585 /sound/soc/intel/atom
parent9da96f99f15169b8bf77a1f27ed6d926f82ea59f (diff)
parent3e4f7a4956e54143f7fc15c636158ad4166d219d (diff)
Merge branch 'rcu-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RCU fixes from Ingo Molnar: "This fixes sporadic ACPI related hangs in synchronize_rcu() that were caused by the ACPI code mistakenly relying on an aspect of RCU that was neither promised to work nor reliable but which happened to work - until in v4.9 we changed the RCU implementation, which made the hangs more prominent. Since the mis-use of the RCU facility wasn't properly detected and prevented either, these fixes make the RCU side work reliably instead of working around the problem in the ACPI code. Hence the slightly larger diffstat that goes beyond the normal scope of RCU fixes in -rc kernels" * 'rcu-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: rcu: Narrow early boot window of illegal synchronous grace periods rcu: Remove cond_resched() from Tiny synchronize_sched()
Diffstat (limited to 'sound/soc/intel/atom')