From 0ecf26fc7d2f24570b4c04a668c437b8656a40a7 Mon Sep 17 00:00:00 2001
From: Werner Fink <werner@suse.de>
Date: Mon, 24 Sep 2012 12:50:37 -0700
Subject: [PATCH 1/3] Change how pdf doc's are created

 Currently the pdf docs are done with
    sgml -> sgmltool -> tex -> latex -> dvi -> dvips -> ps -> ps2pdf -> pdf
 or
    tex -> latex -> dvi -> dvips -> ps -> ps2pdf -> pdf
 with this patch we do
    sgml -> sgmltool -> tex -> pdflatex -> pdf
 or
    tex -> pdflatex -> pdf
---
 doc/Makefile | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 1df60813..b92957ed 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -6,7 +6,7 @@ PSFILES=ip-cref.ps ip-tunnels.ps api-ip6-flowlabels.ps ss.ps nstat.ps arpd.ps rt
 
 LATEX=latex
 DVIPS=dvips
-SGML2DVI=sgml2latex --output=dvi
+SGML2DVI=sgml2latex
 SGML2HTML=sgml2html -s 0
 LPR=lpr -Zsduplex
 SHELL=bash
@@ -31,8 +31,11 @@ pdf: $(PDFFILES)
 print: $(PSFILES)
 	$(LPR) $(PSFILES)
 
+%.tex: %.sgml
+	$(SGML2DVI) --output=tex $<
+
 %.dvi: %.sgml
-	$(SGML2DVI) $<
+	$(SGML2DVI) --output=dvi $<
 
 %.dvi: %.tex
 	@set -e; pass=2; echo "Running LaTeX $<"; \
@@ -44,10 +47,17 @@ print: $(PSFILES)
 		echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \
 	done
 
-#%.pdf: %.tex
-#	pdflatex $<
-%.pdf: %.ps
-	ps2pdf $<
+%.pdf: %.tex
+	@set -e; pass=2; echo "Running pdfLaTeX $<"; \
+	while [ `pdflatex $< </dev/null 2>&1 | \
+		 grep -c '^\(LaTeX Warning: Label(s) may\|No file \|! Emergency stop\)'` -ge 1 ]; do \
+		if [ $$pass -gt 3 ]; then \
+			echo "Seems, something is wrong. Try by hands." ; exit 1 ; \
+		fi; \
+		echo "Re-running pdfLaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \
+	done
+#%.pdf: %.ps
+#	ps2pdf $<
 
 %.ps: %.dvi
 	$(DVIPS) $< -o $@

From ab12370657b73b723b0127a1d25578455d5b6174 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 1 Oct 2012 08:38:03 -0700
Subject: [PATCH 2/3] update header files to 3.6

---
 include/linux/xfrm.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 0aa3805a..1ef80ef8 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -84,6 +84,8 @@ struct xfrm_replay_state {
 	__u32	bitmap;
 };
 
+#define XFRMA_REPLAY_ESN_MAX	4096
+
 struct xfrm_replay_state_esn {
 	unsigned int	bmp_len;
 	__u32		oseq;

From 808ed6e10a4af30807b0ac1db4c91a2e5d0403ec Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 1 Oct 2012 08:39:21 -0700
Subject: [PATCH 3/3] v3.6.0

---
 include/SNAPSHOT.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/SNAPSHOT.h b/include/SNAPSHOT.h
index b8eb6c17..d4fc137c 100644
--- a/include/SNAPSHOT.h
+++ b/include/SNAPSHOT.h
@@ -1 +1 @@
-static const char SNAPSHOT[] = "120801";
+static const char SNAPSHOT[] = "121001";