From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Mon, 4 May 2009 15:44:14 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=81d7112c898c0798cbeca2ff99fbb502dcf9f24b;p=linux-2.6.git
---
diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 88da01e36..24f849fcd 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -171,6 +171,7 @@ Patch680: linux-2.6-680-htb-hysteresis-tso.patch
Patch690: linux-2.6-690-web100.patch
Patch700: linux-2.6-700-egre.patch
Patch710: linux-2.6-710-netns-unshare-kludge.patch
+Patch720: linux-2.6-720-click.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -360,6 +361,7 @@ KERNEL_PREVIOUS=vanilla
%ApplyPatch 660
%ApplyPatch 700
%ApplyPatch 710
+%ApplyPatch 720
rm -fr linux-%{kversion}
diff --git a/linux-2.6-720-click.patch b/linux-2.6-720-click.patch
deleted file mode 100644
index 61e54bdbe..000000000
--- a/linux-2.6-720-click.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
- <title>/linux-2.6/branches/trellis/linux-2.6-700-click-for-trellis.patch - PlanetLab - Trac</title><link rel="start" href="/wiki" /><link rel="search" href="/search" /><link rel="help" href="/wiki/TracGuide" /><link rel="stylesheet" href="/chrome/common/css/trac.css" type="text/css" /><link rel="stylesheet" href="/chrome/common/css/code.css" type="text/css" /><link rel="stylesheet" href="/chrome/common/css/browser.css" type="text/css" /><link rel="icon" href="http://www.planet-lab.org/sites/default/themes/chameleon/planetlab/favicon.ico" type="image/x-icon" /><link rel="shortcut icon" href="http://www.planet-lab.org/sites/default/themes/chameleon/planetlab/favicon.ico" type="image/x-icon" /><link rel="up" href="/browser/linux-2.6/branches/trellis?rev=12809" title="Parent directory" /><link rel="alternate" href="/browser/linux-2.6/branches/trellis/linux-2.6-700-click-for-trellis.patch?rev=12809&format=txt" title="Plain Text" type="text/plain" /><link rel="alternate" href="/browser/linux-2.6/branches/trellis/linux-2.6-700-click-for-trellis.patch?rev=12809&format=raw" title="Original Format" type="text/x-diff; charset=iso-8859-15" /><style type="text/css">
-</style>
- <script type="text/javascript" src="/chrome/common/js/trac.js"></script>
-</head>
-<body>
-
-
-<div id="banner">
-
-<div id="header"><a id="logo" href="http://svn.planet-lab.org/"><img src="http://www.planet-lab.org/sites/default/themes/chameleon/planetlab/logo.png" alt="" /></a><hr /></div>
-
-<form id="search" action="/search" method="get">
-
-</form>
-
-
-
-<div id="metanav" class="nav"><ul><li class="first"><a href="/login">Login</a></li><li><a href="/settings">Settings</a></li><li><a accesskey="6" href="/wiki/TracGuide">Help/Guide</a></li><li class="last"><a href="/about">About Trac</a></li></ul></div>
-</div>
-
-<div id="mainnav" class="nav"><ul><li class="first"><a accesskey="1" href="/wiki">Wiki</a></li><li><a accesskey="2" href="/timeline">Timeline</a></li><li><a accesskey="3" href="/roadmap">Roadmap</a></li><li class="active"><a href="/browser">Browse Source</a></li><li class="last"><a href="/query">View Tickets</a></li></ul></div>
-<div id="main">
-
-
-
-
-<div id="ctxtnav" class="nav">
- <ul>
- <li class="first"><a href="/changeset/11996/linux-2.6/branches/trellis/linux-2.6-700-click-for-trellis.patch">
- Last Change</a></li>
- <li class="last"><a href="/log/linux-2.6/branches/trellis/linux-2.6-700-click-for-trellis.patch?rev=12809">
- Revision Log</a></li>
- </ul>
-</div>
-
-
-<div id="searchable">
-<div id="content" class="browser">
- <h1><a class="first" title="Go to root directory" href="/browser?rev=12809">root</a><span class="sep">/</span><a title="View linux-2.6" href="/browser/linux-2.6?rev=12809">linux-2.6</a><span class="sep">/</span><a title="View branches" href="/browser/linux-2.6/branches?rev=12809">branches</a><span class="sep">/</span><a title="View trellis" href="/browser/linux-2.6/branches/trellis?rev=12809">trellis</a><span class="sep">/</span><a title="View linux-2.6-700-click-for-trellis.patch" href="/browser/linux-2.6/branches/trellis/linux-2.6-700-click-for-trellis.patch?rev=12809">linux-2.6-700-click-for-trellis.patch</a></h1>
-
- <div id="jumprev">
- <form action="" method="get">
- <div>
- <label for="rev">View revision:</label>
- <input type="text" id="rev" name="rev" value="12809" size="4" />
- </div>
- </form>
- </div>
-
-
-
-
- <table id="info" summary="Revision info"><tr>
- <th scope="col">
- Revision <a href="/changeset/11996">11996</a>, 4.5 MB
- (checked in by sapanb, 3 months ago)
- </th></tr><tr>
- <td class="message"><p>
--- <br />
-</p>
-</td>
- </tr>
- </table>
- <div id="preview">
- <strong>HTML preview not available</strong>, since the file size exceeds
- 262144 bytes. Try <a href="/browser/linux-2.6/branches/trellis/linux-2.6-700-click-for-trellis.patch?rev=12809&format=raw">downloading</a> the file instead.
- </div>
-
- <div id="help">
- <strong>Note:</strong> See <a href="/wiki/TracBrowser">TracBrowser</a> for help on using the browser.
- </div>
-
- <div id="anydiff">
- <form action="/anydiff" method="get">
- <div class="buttons">
- <input type="hidden" name="new_path" value="/linux-2.6/branches/trellis/linux-2.6-700-click-for-trellis.patch" />
- <input type="hidden" name="old_path" value="/linux-2.6/branches/trellis/linux-2.6-700-click-for-trellis.patch" />
- <input type="hidden" name="new_rev" value="12809" />
- <input type="hidden" name="old_rev" value="12809" />
- <input type="submit" value="View changes..." title="Prepare an Arbitrary Diff" />
- </div>
- </form>
- </div>
-
-</div>
-</div>
-<script type="text/javascript">searchHighlight()</script>
-<div id="altlinks"><h3>Download in other formats:</h3><ul><li class="first"><a href="/browser/linux-2.6/branches/trellis/linux-2.6-700-click-for-trellis.patch?rev=12809&format=txt">Plain Text</a></li><li class="last"><a href="/browser/linux-2.6/branches/trellis/linux-2.6-700-click-for-trellis.patch?rev=12809&format=raw">Original Format</a></li></ul></div>
-
-</div>
-
-<div id="footer">
- <hr />
- <a id="tracpowered" href="http://trac.edgewall.org/"><img src="/chrome/common/trac_logo_mini.png" height="30" width="107"
- alt="Trac Powered"/></a>
- <p class="left">
- Powered by <a href="/about"><strong>Trac 0.10.4</strong></a><br />
- By <a href="http://www.edgewall.org/">Edgewall Software</a>.
- </p>
- <p class="right">
- Copyright © 2007 The Trustees of Princeton University<br /><a href="http://www.planet-lab.org/">http://www.planet-lab.org/</a>
- </p>
-</div>
-
-
-
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ?
-"https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost +
-"google-analytics.com/ga.js'
-type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7358032-1");
-pageTracker._trackPageview();
-} catch(err) {}</script>
-
-
-
- </body>
-</html>
-