[kernel] r17206 - in dists/trunk/linux-2.6/debian/patches: bugfix/all bugfix/sparc bugfix/x86 debian features/all series

Ben Hutchings benh at alioth.debian.org
Wed Apr 6 13:38:07 UTC 2011 

Author: benh
Date: Wed Apr  6 13:38:04 2011
New Revision: 17206

Log:
Refresh/drop patches for 2.6.39-rc2

Deleted:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/rtc-rtc-ds1511-world-writable-sysfs-nvram-file.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/all/scsi-aic94xx-world-writable-sysfs-update_bios-file.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/all/scsi-iscsi-world-writable-sysfs-priv_sess-file.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/sparc/sparc-Fix-.size-directive-for-do_int_load.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/x86/Correct-a-typo-in-async_page_fault-label.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/x86/Correct-a-typo-in-xen_do_hypervisor_callback-label.patch
   dists/trunk/linux-2.6/debian/patches/debian/ext4-Disable-FS_IOC_FIEMAP-ioctl-temporarily.patch
   dists/trunk/linux-2.6/debian/patches/features/all/adfs-remove-the-big-kernel-lock.patch
   dists/trunk/linux-2.6/debian/patches/features/all/appletalk-remove-the-BKL.patch
   dists/trunk/linux-2.6/debian/patches/features/all/drm-i810-remove-the-BKL.patch
   dists/trunk/linux-2.6/debian/patches/features/all/r8712u-Firmware-changes-for-driver.patch
   dists/trunk/linux-2.6/debian/patches/features/all/r8712u-Switch-driver-to-use-external-firmware.patch
   dists/trunk/linux-2.6/debian/patches/features/all/staging-usbip-convert-to-kthread.patch
   dists/trunk/linux-2.6/debian/patches/features/all/ufs-remove-the-BKL.patch
   dists/trunk/linux-2.6/debian/patches/features/all/vt6656-Use-request_firmware-to-load-firmware.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/patches/features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch	Wed Apr  6 13:19:45 2011	(r17205)
+++ dists/trunk/linux-2.6/debian/patches/features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch	Wed Apr  6 13:38:04 2011	(r17206)
@@ -1,4 +1,3 @@
-From 2586084c10194e943bba6e6995412289b009571d Mon Sep 17 00:00:00 2001
 From: Ben Hutchings <ben at decadent.org.uk>
 Date: Sun, 6 Mar 2011 21:56:24 +0000
 Subject: [PATCH] perf: Define make variables ARCH and SRCARCH consistently with Kbuild
@@ -9,22 +8,11 @@
 
 Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 ---
- tools/perf/Makefile              |   20 ++++++++------------
- tools/perf/arch/arm/Makefile     |    2 +-
- tools/perf/arch/powerpc/Makefile |    2 +-
- tools/perf/arch/s390/Makefile    |    2 +-
- tools/perf/arch/sh/Makefile      |    2 +-
- tools/perf/arch/sparc/Makefile   |    2 +-
- tools/perf/arch/x86/Makefile     |    2 +-
- 7 files changed, 14 insertions(+), 18 deletions(-)
-
-diff --git a/tools/perf/Makefile b/tools/perf/Makefile
-index 7141c42..c5d09b0 100644
 --- a/tools/perf/Makefile
 +++ b/tools/perf/Makefile
 @@ -174,19 +174,15 @@ uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
- uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
- uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
+ 
+ uname_M := $(shell uname -m 2>/dev/null || echo not)
  
 -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
 +ARCH ?= $(uname_M)
@@ -71,8 +59,8 @@
 --include arch/$(ARCH)/Makefile
 +-include arch/$(SRCARCH)/Makefile
  
- ifeq ($(uname_S),Darwin)
- 	ifndef NO_FINK
+ ifneq ($(OUTPUT),)
+ 	BASIC_CFLAGS += -I$(OUTPUT)
 @@ -571,7 +567,7 @@ endif
  
  ifndef NO_DWARF
@@ -142,6 +130,3 @@
 -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
 +LIB_OBJS += $(OUTPUT)arch/$(SRCARCH)/util/dwarf-regs.o
  endif
--- 
-1.7.4.1
-

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Wed Apr  6 13:19:45 2011	(r17205)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Wed Apr  6 13:38:04 2011	(r17206)
@@ -8,14 +8,14 @@
 
 # Patches and source files from aufs2 repository, imported with
 # debian/patches/features/all/aufs2/gen-patch.
-+ features/all/aufs2/aufs2-base.patch
-+ features/all/aufs2/aufs2-standalone.patch
-+ features/all/aufs2/aufs2-kbuild.patch
-+ features/all/aufs2/aufs2-add.patch
+#+ features/all/aufs2/aufs2-base.patch
+#+ features/all/aufs2/aufs2-standalone.patch
+#+ features/all/aufs2/aufs2-kbuild.patch
+#+ features/all/aufs2/aufs2-add.patch
 # mark as staging/crap
-+ features/all/aufs2/mark-as-staging.patch
+#+ features/all/aufs2/mark-as-staging.patch
 # fix not upstream yet
-+ features/all/aufs2/Fix-aufs-calling-of-security_path_mknod.patch
+#+ features/all/aufs2/Fix-aufs-calling-of-security_path_mknod.patch
 
 + bugfix/ia64/hardcode-arch-script-output.patch
 + bugfix/mips/disable-advansys.patch
@@ -38,22 +38,7 @@
 + bugfix/x86/Skip-looking-for-ioapic-overrides-when-ioapics-are-not-present.patch
 + bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch
 + features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch
-+ features/all/r8712u-Switch-driver-to-use-external-firmware.patch
-+ features/all/r8712u-Firmware-changes-for-driver.patch
 
-+ bugfix/all/rtc-rtc-ds1511-world-writable-sysfs-nvram-file.patch
-+ bugfix/all/scsi-aic94xx-world-writable-sysfs-update_bios-file.patch
-+ bugfix/all/scsi-iscsi-world-writable-sysfs-priv_sess-file.patch
-+ bugfix/x86/Correct-a-typo-in-xen_do_hypervisor_callback-label.patch
-+ bugfix/x86/Correct-a-typo-in-async_page_fault-label.patch
-+ features/all/vt6656-Use-request_firmware-to-load-firmware.patch
 + features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch
-+ bugfix/sparc/sparc-Fix-.size-directive-for-do_int_load.patch
 + bugfix/arm/arm-Fix-.size-directive-for-xscale_dma_a0_map_area.patch
-+ features/all/adfs-remove-the-big-kernel-lock.patch
-+ features/all/appletalk-remove-the-BKL.patch
-+ features/all/drm-i810-remove-the-BKL.patch
-+ features/all/staging-usbip-convert-to-kthread.patch
-+ features/all/ufs-remove-the-BKL.patch
-+ debian/ext4-Disable-FS_IOC_FIEMAP-ioctl-temporarily.patch
 + debian/sched-autogroup-disabled.patch

More information about the Kernel-svn-changes mailing list