Add another conflicts to deal with 2 digit
versions (libdm.)
Now that $SUBLEVEL in Makefile is optional, drop it and simplify
linux-3.0-fix-uts-release.patch
linux-2.6-i386-nx-emulation.patch: fix simple reject
drm-intel-eeebox-eb1007-quirk.patch,
revert-ftrace-remove-unnecessary-disabling-of-irqs.patch,
ath5k-disable-fast-channel-switching-by-default.patch: drop
upstream patches.
This is a fix for the NX emulation patch to force the brk area well
outside of the exec randomization area to avoid future allocation or brk
growth collisions. Normally this isn't a problem, except when the text
region has been loaded from a PIE binary and the CS limit can't be put
just above bss.
A test-case that will show failures without this patch can be found here:
http://bazaar.launchpad.net/~ubuntu-bugcontrol/qa-regression-testing/master/annotate/head%3A/scripts/kernel-aslr-collisions/explode-brk.c
Signed-off-by: Kees Cook <kees.cook@canonical.com>