[kernel] r22296 - dists/squeeze-security/linux-2.6/debian/patches/features/arm

Ben Hutchings benh at moszumanska.debian.org
Wed Jan 28 22:41:25 UTC 2015


Author: benh
Date: Wed Jan 28 22:41:25 2015
New Revision: 22296

Log:
Adjust format of one patch to work with current GNU patch

GNU patch complains about missing files even where the patch only has
'diff' and 'index' lines for them.

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/features/arm/mpp-update-for-f6282.patch

Modified: dists/squeeze-security/linux-2.6/debian/patches/features/arm/mpp-update-for-f6282.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/features/arm/mpp-update-for-f6282.patch	Wed Jan 28 22:33:43 2015	(r22295)
+++ dists/squeeze-security/linux-2.6/debian/patches/features/arm/mpp-update-for-f6282.patch	Wed Jan 28 22:41:25 2015	(r22296)
@@ -9,6 +9,8 @@
 
 Signed-off-by: Benjamin Zores <benjamin.zores at alcatel-lucent.com>
 Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
+[ Removed changes to netspace_v2-setup.c and netxbig_v2-setup.c; not in 2.6.32
+  -- tbm ]
 ---
 
 diff --git a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
@@ -629,12 +631,6 @@
  
  #define MPP_MAX			49
  
-diff --git a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c
-index 3ae158d..b96e43b 100644
-[ removed; not in 2.6.32 -- tbm ]
-diff --git a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
-index 8a2bb02..2bd14c5 100644
-[ removed; not in 2.6.32 -- tbm ]
 diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
 index 2830f0f..d23aff9 100644
 --- a/arch/arm/mach-kirkwood/ts219-setup.c



More information about the Kernel-svn-changes mailing list