From a8872b488bf525ea800232e9815be8cc5b46cc86 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 9 Jan 2013 15:22:46 -0800 Subject: [PATCH] refresh --- meta | 7 +++---- patches/pre-udp | 14 ++++++++++++-- patches/refresh-temp | 20 -------------------- 3 files changed, 15 insertions(+), 26 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index fc67ac8d..007b9923 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: bb4270fe0a9ab9596e2c2c185c820f969bb91df9 -Head: 13a2ea6b8e9b3123a23a9aa30b1c35d840458a73 +Previous: 80b1f846fc96774879a4ff747a76ac8f62adc756 +Head: 3201fb1717a0e1374d7eccc975d0c21714b246bb Applied: - pre-udp: 7e0c1eed66b55752a7cd151b7f9cc8471fe80fee - refresh-temp: 13a2ea6b8e9b3123a23a9aa30b1c35d840458a73 + pre-udp: 3201fb1717a0e1374d7eccc975d0c21714b246bb Unapplied: resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9 rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f diff --git a/patches/pre-udp b/patches/pre-udp index 1701d512..c1c0f846 100644 --- a/patches/pre-udp +++ b/patches/pre-udp @@ -1,5 +1,5 @@ Bottom: cf8998b9f06f893b499b9478f40610fb02b1993a -Top: cf8998b9f06f893b499b9478f40610fb02b1993a +Top: 26d22c27ce9f6ea665ee146c378b4269df197ab2 Author: Sean Hefty Date: 2013-01-09 14:54:47 -0800 @@ -12,4 +12,14 @@ Signed-off-by: Sean Hefty --- - +diff --git a/src/preload.c b/src/preload.c +index fb2149b..04ac6a0 100644 +--- a/src/preload.c ++++ b/src/preload.c +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2011-2012 Intel Corporation. All rights reserved. ++ * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. + * + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 9ae4d175..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,20 +0,0 @@ -Bottom: cf8998b9f06f893b499b9478f40610fb02b1993a -Top: 26d22c27ce9f6ea665ee146c378b4269df197ab2 -Author: Sean Hefty -Date: 2013-01-09 15:22:45 -0800 - -Refresh of pre-udp - ---- - -diff --git a/src/preload.c b/src/preload.c -index fb2149b..04ac6a0 100644 ---- a/src/preload.c -+++ b/src/preload.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2011-2012 Intel Corporation. All rights reserved. -+ * Copyright (c) 2011-2013 Intel Corporation. All rights reserved. - * - * This software is available to you under a choice of one of two - * licenses. You may choose to be licensed under the terms of the GNU -- 2.46.0