X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=f55f9b2771cf31004ca3b58883b2b8c7de115fcb;hb=2ddd7eb4673ac25b4d5dfdc681d58abc497498ac;hp=ed0fad45d141b894217fe90a65ec3fd1ff77e46e;hpb=32ee90cca7d13117f4679f48476e53ed63b709fc;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index ed0fad45d..f55f9b277 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -24,7 +24,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # for module-tag.py - sublevel is used for the version (middle) part of tag names
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 20
+%define taglevel 21
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -847,6 +847,9 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* Fri Aug 01 2008 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-22-21
+- Codemux calls setsockopt/SO_PEERCRED to set peer credentials on a socket, so that the connections it proxies to its clients are tagged for PlanetFlow. This hunk got lost somewhere along the way.
+
 * Thu Jul 31 2008 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-22-20
 - Removed a debugging statement. Shows up a lot in the debug logs.