diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-06-28 14:22:50 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-06-28 17:33:06 -0400 |
| commit | a0a7d08ac77cd95d846a49f64d1043fc46410670 (patch) | |
| tree | 58562da2727fe54937664339afb1f13775828eb2 | |
| parent | ce238024971ace9bf685ec33a2c913308db4edb1 (diff) | |
| download | longterm-queue-2.6.34-a0a7d08ac77cd95d846a49f64d1043fc46410670.tar.gz | |
mark duplicate upstream patch
linux-2.6$git tag --contains c4d0c3b097f7584772316ee4d64a09fe0e4ddfca
v2.6.39
v2.6.39-rc1
...
linux-2.6$git tag --contains 3a3675b7f23f83ca8c67c9c2b6edf707fd28d1ba
v2.6.38
v2.6.38-rc7
...
linux-2.6.34.y$git show c4d0c3b097f7584772316ee4d64a09fe0e4ddfca > a
linux-2.6.34.y$git show 3a3675b7f23f83ca8c67c9c2b6edf707fd28d1ba > b
linux-2.6.34.y$diff -u a b
--- a 2011-06-28 14:23:36.549804803 -0400
+++ b 2011-06-28 14:23:44.649431589 -0400
@@ -1,4 +1,4 @@
-commit c4d0c3b097f7584772316ee4d64a09fe0e4ddfca
+commit 3a3675b7f23f83ca8c67c9c2b6edf707fd28d1ba
Author: Dan Rosenberg <drosenberg@vsecurity.com>
Date: Mon Feb 14 13:45:28 2011 +0000
linux-2.6.34.y$
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | audit/from-v2.6.32/audit.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/audit/from-v2.6.32/audit.txt b/audit/from-v2.6.32/audit.txt index e4899f6..4c81946 100644 --- a/audit/from-v2.6.32/audit.txt +++ b/audit/from-v2.6.32/audit.txt @@ -2771,7 +2771,7 @@ e8a79883 08fe4db1 v2.6.39 n be7ab6df 34094537 v2.6.39 n d7a23a52 d50e7e36 v2.6.39 n 396c7c0b d370af0e v2.6.39 n -e22b468f c4d0c3b0 v2.6.39 n +e22b468f c4d0c3b0 v2.6.39 n (also 3a3675b7f2) bd94ab29 243b422a v2.6.39 y in queue already 11ab4496 22356585 v2.6.39 n af352e45 c996edcf v2.6.39 n |