summaryrefslogtreecommitdiff
path: root/include/linux/timerqueue.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-05-05 13:54:19 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-05 15:08:38 -0700
commit17aa7e034416e3080bc57a786d09ba0a4a044561 (patch)
tree62ec5b3903e908ec544ce705d398aa433e31e884 /include/linux/timerqueue.h
parent108c1961847df2a875047c0fd27b419cb817d213 (diff)
downloadkernel-17aa7e034416e3080bc57a786d09ba0a4a044561.tar.gz
dev_name introduction fall out fix
Commit 06916639e2fed9ee475efef2747a1b7429f8fe76 ("driver-core: add dev_name() to help transition away from using bus_id") added a static inline dev_name() and used it in dev_printk. Unfortunately, drivers/edac/edac_core.h defines a macro called dev_name(). Rename the latter. Diagnosis by Tony Breeds and Michael Ellerman. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Doug Thompson <dougthompson@xmission.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions
2-02net: ipv6: Emit notification when fib hardware flags are changedAmit Cohen 2021-01-27bpf: Allow rewriting to ports under ip_unprivileged_port_startStanislav Fomichev 2021-01-20bpf: Split cgroup_bpf_enabled per attach typeStanislav Fomichev 2020-12-16Merge tag 'selinux-pr-20201214' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds 2020-12-02bpf: Allow bpf_{s,g}etsockopt from cgroup bind{4,6} hooksStanislav Fomichev 2020-11-23lsm,selinux: pass flowi_common instead of flowi to the LSM hooksPaul Moore 2020-08-31ipv6: add ipv6_fragment hook in ipv6_stubwenxu 2020-08-24io_uring: allow tcp ancillary data for __sys_recvmsg_sock()Luke Hsiao 2020-07-19net: remove compat_sock_common_{get,set}sockoptChristoph Hellwig 2020-05-29Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller 2020-05-22Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDavid S. Miller 2020-05-19bpf: Add get{peer, sock}name attach types for sock_addrDaniel Borkmann 2020-05-18ipv6: move SIOCADDRT and SIOCDELRT handling into ->compat_ioctlChristoph Hellwig 2020-05-18ipv6: lift copy_from_user out of ipv6_route_ioctlChristoph Hellwig 2020-05-09bpf: Allow any port in bpf_bind helperStanislav Fomichev 2020-05-09net: Refactor arguments of inet{,6}_bindStanislav Fomichev 2020-05-06xfrm: expose local_rxpmtu via ipv6_stubsFlorian Westphal 2020-04-28xfrm: add IPv6 support for espintcpSabrina Dubroca 2020-04-28xfrm: add support for UDPv6 encapsulation of ESPSabrina Dubroca 2020-03-29net: ipv6: add rpl sr tunnelAlexander Aring