linux

mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-20 16:48:40 +00:00

History

Glauber Costa 9018e93948 net: explicitly add jump_label.h header to sock.h

Commit 36a1211970193ce215de50ed1e4e1272bc814df1 removed linux/module.h
include statement from one of the headers that end up in net/sock.h.
It was providing us with static_branch() definition implicitly, so
after its removal the build got broken.

To fix this, and avoid having this happening in the future,
let me do the right thing and include linux/jump_label.h
explicitly in sock.h.

Signed-off-by: Glauber Costa <glommer@parallels.com>
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
CC: David S. Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

2012-01-26 17:13:26 -05:00

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-01-18 15:51:48 -08:00

asm-generic

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

crypto

…

drm

drm: bump DRM_CONNECTOR_MAX_ENCODER from 2 to 3

2012-01-13 09:01:09 +00:00