stephen hemminger
6d08acd2d3
in6: fix conflict with glibc ...
Resolve conflicts between glibc definition of IPV6 socket options
and those defined in Linux headers. Looks like earlier efforts to
solve this did not cover all the definitions.
It resolves warnings during iproute2 build.
Please consider for stable as well.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-12-22 16:12:36 -05:00
Merge branches 'acpi-scan', 'acpi-utils' and 'acpi-pm'
2014-12-18 18:42:56 +01:00
ARM: SoC/iommu configuration for 3.19
2014-12-16 14:53:01 -08:00
crypto: af_alg - add user space interface for AEAD
2014-12-05 23:56:55 +08:00
drm/fb: add support for tiled monitor configurations. (v2)
2014-12-09 09:56:49 +10:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-12-17 10:16:27 -08:00
arm/arm64: KVM: Require in-kernel vgic for the arch timers
2014-12-15 11:50:42 +01:00
The exciting thing here is the getting rid of stop_machine on module
2014-12-18 20:55:41 -08:00
[media] media: v4l2-image-sizes.h: correct the SVGA height definition
2014-12-04 13:56:56 -02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-12-16 15:53:03 -08:00
IB/core: Implement support for MMU notifiers regarding on demand paging regions
2014-12-15 18:13:36 -08:00
More ACPI and power management updates for 3.19-rc1
2014-12-18 20:28:33 -08:00
Merge branch 'at91/cleanup5' into next/drivers
2014-12-08 18:29:20 +01:00
sound updates for 3.19-rc1
2014-12-11 13:20:50 -08:00
The exciting thing here is the getting rid of stop_machine on module
2014-12-18 20:55:41 -08:00
in6: fix conflict with glibc
2014-12-22 16:12:36 -05:00
OMAPDSS: Remove all references to obsolete HDMI audio callbacks
2014-12-01 11:09:59 +02:00
xen/arm: introduce GNTTABOP_cache_flush
2014-12-04 12:41:54 +00:00
6d08acd2d3