[kernel] r18675 - in dists/squeeze-backports/linux-2.6: . debian debian/bin debian/config debian/config/alpha debian/config/armel debian/config/m68k debian/config/mips debian/installer debian/patches/bugfix/all debian/patches/bugfix/x86 debian/patches/features/all/aufs3 debian/patches/series debian/templates/temp.image.plain
Ben Hutchings
benh at alioth.debian.org
Fri Feb 10 03:23:59 UTC 2012
Author: benh
Date: Fri Feb 10 03:23:57 2012
New Revision: 18675
Log:
Merge changes from trunk up to 3.2.4-1
Added:
dists/squeeze-backports/linux-2.6/debian/config/armel/config.mv78xx0
- copied unchanged from r18667, dists/trunk/linux-2.6/debian/config/armel/config.mv78xx0
dists/squeeze-backports/linux-2.6/debian/patches/bugfix/all/pci-rework-aspm-disable-code.patch
- copied unchanged from r18667, dists/trunk/linux-2.6/debian/patches/bugfix/all/pci-rework-aspm-disable-code.patch
dists/squeeze-backports/linux-2.6/debian/patches/bugfix/x86/KVM-x86-extend-struct-x86_emulate_ops-with-get_cpuid.patch
- copied unchanged from r18667, dists/trunk/linux-2.6/debian/patches/bugfix/x86/KVM-x86-extend-struct-x86_emulate_ops-with-get_cpuid.patch
dists/squeeze-backports/linux-2.6/debian/patches/bugfix/x86/KVM-x86-fix-missing-checks-in-syscall-emulation.patch
- copied unchanged from r18667, dists/trunk/linux-2.6/debian/patches/bugfix/x86/KVM-x86-fix-missing-checks-in-syscall-emulation.patch
Deleted:
dists/squeeze-backports/linux-2.6/debian/patches/bugfix/all/block-add-and-use-scsi_blk_cmd_ioctl.patch
dists/squeeze-backports/linux-2.6/debian/patches/bugfix/all/block-fail-SCSI-passthrough-ioctls-on-partition-devi.patch
dists/squeeze-backports/linux-2.6/debian/patches/bugfix/all/dm-do-not-forward-ioctls-from-logical-volumes-to-the.patch
dists/squeeze-backports/linux-2.6/debian/patches/bugfix/all/media-V4L-DVB-v4l2-ioctl-integer-overflow-in-video_usercopy.patch
dists/squeeze-backports/linux-2.6/debian/patches/bugfix/all/net-reintroduce-missing-rcu_assign_pointer-calls.patch
dists/squeeze-backports/linux-2.6/debian/patches/bugfix/all/proc-clean-up-and-fix-proc-pid-mem-handling.patch
dists/squeeze-backports/linux-2.6/debian/patches/bugfix/all/rtc-Fix-alarm-rollover-when-day-or-month-is-out-of-r.patch
dists/squeeze-backports/linux-2.6/debian/patches/series/2
Modified:
dists/squeeze-backports/linux-2.6/ (props changed)
dists/squeeze-backports/linux-2.6/debian/bin/abiupdate.py
dists/squeeze-backports/linux-2.6/debian/bin/buildcheck.py
dists/squeeze-backports/linux-2.6/debian/changelog
dists/squeeze-backports/linux-2.6/debian/config/alpha/defines
dists/squeeze-backports/linux-2.6/debian/config/armel/config.kirkwood
dists/squeeze-backports/linux-2.6/debian/config/armel/config.orion5x
dists/squeeze-backports/linux-2.6/debian/config/armel/defines
dists/squeeze-backports/linux-2.6/debian/config/config
dists/squeeze-backports/linux-2.6/debian/config/defines
dists/squeeze-backports/linux-2.6/debian/config/m68k/defines
dists/squeeze-backports/linux-2.6/debian/config/mips/config.octeon
dists/squeeze-backports/linux-2.6/debian/config/mips/config.sb1-bcm91250a
dists/squeeze-backports/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
dists/squeeze-backports/linux-2.6/debian/installer/package-list
dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-add.patch
dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-base.patch
dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-kbuild.patch
dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-standalone.patch
dists/squeeze-backports/linux-2.6/debian/patches/series/base
dists/squeeze-backports/linux-2.6/debian/rules.real
dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/postinst
dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/postrm
dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/preinst
dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/prerm
Modified: dists/squeeze-backports/linux-2.6/debian/bin/abiupdate.py
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/bin/abiupdate.py Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/bin/abiupdate.py Fri Feb 10 03:23:57 2012 (r18675)
@@ -15,13 +15,14 @@
default_url_base = "http://ftp.de.debian.org/debian/"
default_url_base_incoming = "http://incoming.debian.org/"
+default_url_base_ports = "http://ftp.debian-ports.org/debian/"
class url_debian_flat(object):
def __init__(self, base):
self.base = base
- def __call__(self, source, filename):
+ def __call__(self, source, filename, arch):
return self.base + filename
@@ -29,10 +30,17 @@
def __init__(self, base):
self.base = base
- def __call__(self, source, filename):
+ def __call__(self, source, filename, arch):
return self.base + "pool/main/" + source[0] + "/" + source + "/" + filename
+class url_debian_ports_pool(url_debian_pool):
+ def __call__(self, source, filename, arch):
+ if arch == 'all':
+ return url_debian_pool.__call__(self, source, filename, arch)
+ return self.base + "pool-" + arch + "/main/" + source[0] + "/" + source + "/" + filename
+
+
class Main(object):
dir = None
@@ -62,7 +70,7 @@
def __call__(self):
self.dir = tempfile.mkdtemp(prefix='abiupdate')
try:
- self.log("Retreive config\n")
+ self.log("Retrieve config\n")
config = self.get_config()
if self.override_arch:
arches = [self.override_arch]
@@ -81,7 +89,7 @@
def get_abi(self, arch, prefix):
filename = "linux-headers-%s-%s_%s_%s.deb" % (self.version_abi, prefix, self.version_source, arch)
- f = self.retrieve_package(self.url, filename)
+ f = self.retrieve_package(self.url, filename, arch)
d = self.extract_package(f, "linux-headers-%s_%s" % (prefix, arch))
f1 = d + "/usr/src/linux-headers-%s-%s/Module.symvers" % (self.version_abi, prefix)
s = Symbols(open(f1))
@@ -90,15 +98,15 @@
def get_config(self):
filename = "linux-support-%s_%s_all.deb" % (self.version_abi, self.version_source)
- f = self.retrieve_package(self.url_config, filename)
+ f = self.retrieve_package(self.url_config, filename, 'all')
d = self.extract_package(f, "linux-support")
c = d + "/usr/src/linux-support-" + self.version_abi + "/config.defines.dump"
config = ConfigCoreDump(fp=file(c))
shutil.rmtree(d)
return config
- def retrieve_package(self, url, filename):
- u = url(self.source, filename)
+ def retrieve_package(self, url, filename, arch):
+ u = url(self.source, filename, arch)
filename_out = self.dir + "/" + filename
f_in = urllib2.urlopen(u)
@@ -165,8 +173,10 @@
options = optparse.OptionParser()
options.add_option("-i", "--incoming", action="store_true", dest="incoming")
options.add_option("--incoming-config", action="store_true", dest="incoming_config")
+ options.add_option("--ports", action="store_true", dest="ports")
options.add_option("-u", "--url-base", dest="url_base", default=default_url_base)
options.add_option("--url-base-incoming", dest="url_base_incoming", default=default_url_base_incoming)
+ options.add_option("--url-base-ports", dest="url_base_ports", default=default_url_base_ports)
opts, args = options.parse_args()
@@ -180,13 +190,16 @@
url_base = url_debian_pool(opts.url_base)
url_base_incoming = url_debian_flat(opts.url_base_incoming)
+ url_base_ports = url_debian_ports_pool(opts.url_base_ports)
if opts.incoming_config:
url = url_config = url_base_incoming
else:
url_config = url_base
if opts.incoming:
url = url_base_incoming
+ elif opts.ports:
+ url = url_base_ports
else:
url = url_base
- main(url, url_config, **kw)()
+ Main(url, url_config, **kw)()
Modified: dists/squeeze-backports/linux-2.6/debian/bin/buildcheck.py
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/bin/buildcheck.py Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/bin/buildcheck.py Fri Feb 10 03:23:57 2012 (r18675)
@@ -44,10 +44,8 @@
self.filename_new = "%s/Module.symvers" % dir
- changelog = Changelog(version=VersionLinux)[0]
- version = changelog.version.linux_version
- abiname = self.config['abi', ]['abiname']
- self.filename_ref = "debian/abi/%s-%s/%s_%s_%s" % (version, abiname, arch, featureset, flavour)
+ version_abi = self.config['version', ]['abiname']
+ self.filename_ref = "debian/abi/%s/%s_%s_%s" % (version_abi, arch, featureset, flavour)
def __call__(self, out):
ret = 0
Modified: dists/squeeze-backports/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/changelog Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/changelog Fri Feb 10 03:23:57 2012 (r18675)
@@ -1,4 +1,4 @@
-linux-2.6 (3.2.1-2~bpo60+1) squeeze-backports; urgency=high
+linux-2.6 (3.2.4-1~bpo60+1) squeeze-backports; urgency=low
* Rebuild for squeeze:
- Use gcc-4.4 for all architectures
@@ -6,7 +6,78 @@
- Change ABI number to 0.bpo.1
- Monkey-patch Python collections module to add OrderedDict if necessary
- -- Ben Hutchings <ben at decadent.org.uk> Tue, 24 Jan 2012 05:03:23 +0000
+ -- Ben Hutchings <ben at decadent.org.uk> Fri, 10 Feb 2012 02:22:53 +0000
+
+linux-2.6 (3.2.4-1) unstable; urgency=low
+
+ * New upstream stable update:
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.3
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.4
+ - eCryptfs: Sanitize write counts of /dev/ecryptfs
+ - eCryptfs: Make truncate path killable
+ - eCryptfs: Check inode changes in setattr
+ - drm/i915: paper over missed irq issues with force wake voodoo
+ - tpm_tis: add delay after aborting command (Closes: #649033)
+ - USB: ftdi_sio: fix initial baud rate (Closes: #658164)
+ - USB: Realtek cr: fix autopm scheduling while atomic (Closes: #656724)
+
+ [ Ben Hutchings ]
+ * [armel] Add mv78xx0 flavour; thanks to Steve McIntyre for the config
+ * net: Disable FIXED_PHY; this driver only causes trouble
+ * PCI: Rework ASPM disable code (fixes power usage regression on some
+ systems)
+
+ [ Bastian Blank ]
+ * Remove unneeded scmversion workaround.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 05 Feb 2012 15:42:21 +0100
+
+linux-2.6 (3.2.2-1) unstable; urgency=low
+
+ * New upstream stable update:
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.2
+ - ext4: fix undefined behavior in ext4_fill_flex_info() (CVE-2009-4307)
+ - Unused iocbs in a batch should not be accounted as active (CVE-2012-0058)
+ - uvcvideo: Fix integer overflow in uvc_ioctl_ctrl_map()
+ - [arm] proc: clear_refs: do not clear reserved pages
+
+ [ Ben Hutchings ]
+ * Clean up linux-image maintainer scripts:
+ - Stop changing 'build' and 'source' symlinks; these now belong to the
+ linux-headers packages
+ - Remove unused configuration variables
+ - prerm: Remove last vestige of /usr/doc transition
+ - postrm: Remove modules.*.bin; currently modules.builtin.bin is left
+ behind
+ * [alpha] Build with gcc-4.5 (Closes: #657112)
+ * aufs: Update to aufs3.2-20120109 (fixes FTBFS on m68k)
+ * [m68k] Fix assembler constraint to prevent overeager gcc optimisation
+ * sdhci-pci: Include driver in installer
+ * [armel] udeb: Do not attempt to build lzo-modules udeb as lzo_compress
+ is now built-in (fixes FTBFS)
+ * [armhf] udeb: Include rt2800usb in nic-modules, replacing rt2870sta
+ which was removed from the kernel
+ * drm: Fix authentication kernel crash
+ * xfs: Fix missing xfs_iunlock() on error recovery path in xfs_readlink()
+ * jbd: Issue cache flush after checkpointing
+ * crypto: sha512 - make it work, undo percpu message schedule
+ - crypto: sha512 - reduce stack usage to safe number
+ * [x86] xen: size struct xen_spinlock to always fit in arch_spinlock_t
+ * l2tp: l2tp_ip - fix possible oops on packet receive
+ * macvlan: fix a possible use after free
+ * tcp: fix tcp_trim_head() to adjust segment count with skb MSS
+ * [x86] KVM: fix missing checks in syscall emulation (CVE-2012-0045)
+
+ [ Thorsten Glaser ]
+ * [m68k] Use gcc-4.6 like (almost) all other architectures
+ * Pass the cflags define as CFLAGS_KERNEL and CFLAGS_MODULE to kbuild
+ * [m68k] Use cflags -ffreestanding (Closes: #648996)
+
+ [ Aurelien Jarno ]
+ * [mips,octeon] Disabled CONFIG_FIXED_PHY as it conflicts with the octeon
+ phy driver.
+
+ -- Ben Hutchings <ben at decadent.org.uk> Wed, 01 Feb 2012 01:44:05 +0000
linux-2.6 (3.2.1-2) unstable; urgency=high
Modified: dists/squeeze-backports/linux-2.6/debian/config/alpha/defines
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/alpha/defines Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/config/alpha/defines Fri Feb 10 03:23:57 2012 (r18675)
@@ -1,7 +1,7 @@
[base]
flavours: alpha-generic alpha-smp alpha-legacy
kernel-arch: alpha
-compiler: gcc-4.4
+compiler: gcc-4.5
[image]
suggests: aboot, fdutils
Modified: dists/squeeze-backports/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/armel/config.kirkwood Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/config/armel/config.kirkwood Fri Feb 10 03:23:57 2012 (r18675)
@@ -453,8 +453,6 @@
##
#. Turned off because this causes networking on some Kirkwood machines to fail
# CONFIG_MARVELL_PHY is not set
-#. Turned off to avoid namespace collisions
-# CONFIG_FIXED_PHY is not set
##
## file: drivers/net/wireless/mwifiex/Kconfig
Copied: dists/squeeze-backports/linux-2.6/debian/config/armel/config.mv78xx0 (from r18667, dists/trunk/linux-2.6/debian/config/armel/config.mv78xx0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux-2.6/debian/config/armel/config.mv78xx0 Fri Feb 10 03:23:57 2012 (r18675, copy of r18667, dists/trunk/linux-2.6/debian/config/armel/config.mv78xx0)
@@ -0,0 +1,610 @@
+##
+## file: arch/arm/Kconfig
+##
+## choice: ARM system type
+CONFIG_MMU=y
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_ORION5X is not set
+CONFIG_ARCH_MV78XX0=y
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+## end choice
+CONFIG_PCI=y
+CONFIG_LEDS=y
+CONFIG_LEDS_CPU=y
+CONFIG_UACCESS_WITH_MEMCPY=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE=""
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+CONFIG_VFP=y
+# CONFIG_ARTHUR is not set
+CONFIG_HIGHMEM=y
+
+##
+## file: arch/arm/mach-mv78xx0/Kconfig
+##
+CONFIG_MACH_DB78X00_BP=y
+CONFIG_MACH_RD78X00_MASA=y
+CONFIG_MACH_TERASTATION_WXL=y
+
+##
+## file: arch/arm/mm/Kconfig
+##
+CONFIG_CPU_FEROCEON_OLD_ID=y
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+
+##
+## file: drivers/ata/Kconfig
+##
+CONFIG_ATA=m
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_SIL24 is not set
+CONFIG_ATA_SFF=y
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_ATA_PIIX is not set
+CONFIG_SATA_MV=m
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_ATA_GENERIC is not set
+
+##
+## file: drivers/bluetooth/Kconfig
+##
+# CONFIG_BT_HCIUART is not set
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+
+##
+## file: drivers/crypto/Kconfig
+##
+CONFIG_CRYPTO_DEV_MV_CESA=m
+
+##
+## file: drivers/dma/Kconfig
+##
+CONFIG_DMADEVICES=y
+CONFIG_MV_XOR=y
+# CONFIG_NET_DMA is not set
+
+##
+## file: drivers/gpio/Kconfig
+##
+CONFIG_GPIO_SYSFS=y
+
+##
+## file: drivers/gpu/drm/Kconfig
+##
+# CONFIG_DRM is not set
+
+##
+## file: drivers/hwmon/Kconfig
+##
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_LM75=m
+
+##
+## file: drivers/i2c/Kconfig
+##
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+##
+## file: drivers/i2c/busses/Kconfig
+##
+CONFIG_I2C_MV64XXX=y
+
+##
+## file: drivers/input/gameport/Kconfig
+##
+CONFIG_GAMEPORT=m
+
+##
+## file: drivers/input/joystick/Kconfig
+##
+CONFIG_INPUT_JOYSTICK=y
+
+##
+## file: drivers/input/keyboard/Kconfig
+##
+CONFIG_KEYBOARD_GPIO=m
+
+##
+## file: drivers/input/touchscreen/Kconfig
+##
+CONFIG_INPUT_TOUCHSCREEN=y
+
+##
+## file: drivers/isdn/Kconfig
+##
+CONFIG_ISDN=y
+CONFIG_ISDN_CAPI=m
+
+##
+## file: drivers/isdn/capi/Kconfig
+##
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+##
+## file: drivers/isdn/hardware/avm/Kconfig
+##
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+
+##
+## file: drivers/isdn/hardware/eicon/Kconfig
+##
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+
+##
+## file: drivers/leds/Kconfig
+##
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+
+##
+## file: drivers/media/Kconfig
+##
+CONFIG_DVB_CORE=m
+
+##
+## file: drivers/mtd/Kconfig
+##
+CONFIG_MTD=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_FTL=m
+CONFIG_NFTL=m
+# CONFIG_NFTL_RW is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+##
+## file: drivers/mtd/chips/Kconfig
+##
+CONFIG_MTD_CFI=y
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+## choice: Flash cmd/query data swapping
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+## end choice
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+#. Needed e.g. on QNAP devices
+CONFIG_MTD_CFI_INTELEXT=y
+#. Needed e.g. on the D-Link DNS-323
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=m
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+##
+## file: drivers/mtd/devices/Kconfig
+##
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+##
+## file: drivers/mtd/maps/Kconfig
+##
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0x0
+CONFIG_MTD_PHYSMAP_LEN=0x0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=0
+# CONFIG_MTD_IMPA7 is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+##
+## file: drivers/mtd/nand/Kconfig
+##
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_VERIFY_WRITE=y
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
+CONFIG_MTD_NAND_ORION=y
+
+##
+## file: drivers/mtd/onenand/Kconfig
+##
+# CONFIG_MTD_ONENAND is not set
+
+##
+## file: drivers/net/arcnet/Kconfig
+##
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/atheros/Kconfig
+##
+# CONFIG_ATL1 is not set
+
+##
+## file: drivers/net/ethernet/broadcom/Kconfig
+##
+# CONFIG_BNX2 is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2X is not set
+
+##
+## file: drivers/net/ethernet/dlink/Kconfig
+##
+# CONFIG_DL2K is not set
+
+##
+## file: drivers/net/ethernet/icplus/Kconfig
+##
+# CONFIG_IP1000 is not set
+
+##
+## file: drivers/net/ethernet/intel/Kconfig
+##
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IGB is not set
+
+##
+## file: drivers/net/ethernet/marvell/Kconfig
+##
+CONFIG_MV643XX_ETH=m
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
+# CONFIG_NS83820 is not set
+
+##
+## file: drivers/net/ethernet/packetengines/Kconfig
+##
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+
+##
+## file: drivers/net/ethernet/qlogic/Kconfig
+##
+# CONFIG_QLA3XXX is not set
+
+##
+## file: drivers/net/ethernet/realtek/Kconfig
+##
+# CONFIG_R8169 is not set
+
+##
+## file: drivers/net/ethernet/sis/Kconfig
+##
+# CONFIG_SIS190 is not set
+
+##
+## file: drivers/net/ethernet/via/Kconfig
+##
+# CONFIG_VIA_VELOCITY is not set
+
+##
+## file: drivers/pcmcia/Kconfig
+##
+# CONFIG_PCCARD is not set
+
+##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_RS5C372=y
+CONFIG_RTC_DRV_PCF8563=y
+CONFIG_RTC_DRV_M41T80=y
+CONFIG_RTC_DRV_S35390A=y
+
+##
+## file: drivers/scsi/Kconfig
+##
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+
+##
+## file: drivers/scsi/aic7xxx/Kconfig.aic79xx
+##
+# CONFIG_SCSI_AIC79XX is not set
+
+##
+## file: drivers/scsi/aic7xxx/Kconfig.aic7xxx
+##
+# CONFIG_SCSI_AIC7XXX is not set
+
+##
+## file: drivers/scsi/aic94xx/Kconfig
+##
+# CONFIG_SCSI_AIC94XX is not set
+
+##
+## file: drivers/scsi/megaraid/Kconfig.megaraid
+##
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+
+##
+## file: drivers/scsi/mvsas/Kconfig
+##
+# CONFIG_SCSI_MVSAS is not set
+
+##
+## file: drivers/scsi/qla2xxx/Kconfig
+##
+# CONFIG_SCSI_QLA_FC is not set
+
+##
+## file: drivers/scsi/qla4xxx/Kconfig
+##
+# CONFIG_SCSI_QLA_ISCSI is not set
+
+##
+## file: drivers/ssb/Kconfig
+##
+# CONFIG_SSB is not set
+
+##
+## file: drivers/tty/serial/Kconfig
+##
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+##
+## file: drivers/usb/Kconfig
+##
+CONFIG_USB_SUPPORT=y
+CONFIG_USB=m
+
+##
+## file: drivers/usb/atm/Kconfig
+##
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+
+##
+## file: drivers/usb/host/Kconfig
+##
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_SL811_HCD=m
+
+##
+## file: drivers/video/Kconfig
+##
+CONFIG_FB=m
+
+##
+## file: drivers/video/console/Kconfig
+##
+# CONFIG_VGA_CONSOLE is not set
+
+##
+## file: drivers/watchdog/Kconfig
+##
+CONFIG_ORION_WATCHDOG=m
+
+##
+## file: fs/Kconfig.binfmt
+##
+CONFIG_BINFMT_AOUT=m
+
+##
+## file: fs/partitions/Kconfig
+##
+CONFIG_ACORN_PARTITION=y
+# CONFIG_ACORN_PARTITION_CUMANA is not set
+# CONFIG_ACORN_PARTITION_EESOX is not set
+CONFIG_ACORN_PARTITION_ICS=y
+# CONFIG_ACORN_PARTITION_ADFS is not set
+# CONFIG_ACORN_PARTITION_POWERTEC is not set
+CONFIG_ACORN_PARTITION_RISCIX=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+CONFIG_SGI_PARTITION=y
+CONFIG_ULTRIX_PARTITION=y
+CONFIG_SUN_PARTITION=y
+CONFIG_EFI_PARTITION=y
+
+##
+## file: mm/Kconfig
+##
+## choice: Memory model
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+## end choice
+
+##
+## file: net/atm/Kconfig
+##
+CONFIG_ATM=m
+
+##
+## file: net/ax25/Kconfig
+##
+CONFIG_HAMRADIO=y
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+##
+## file: net/wanrouter/Kconfig
+##
+CONFIG_WAN_ROUTER=m
+
+##
+## file: unknown
+##
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_DEBUG is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_NET_ETHERNET is not set
+
Modified: dists/squeeze-backports/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/armel/config.orion5x Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/config/armel/config.orion5x Fri Feb 10 03:23:57 2012 (r18675)
@@ -433,8 +433,6 @@
##
#. Turned off because this causes networking on some Orion machines to fail
# CONFIG_MARVELL_PHY is not set
-#. Turned off to avoid namespace collisions
-# CONFIG_FIXED_PHY is not set
##
## file: drivers/pcmcia/Kconfig
Modified: dists/squeeze-backports/linux-2.6/debian/config/armel/defines
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/armel/defines Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/config/armel/defines Fri Feb 10 03:23:57 2012 (r18675)
@@ -3,6 +3,7 @@
iop32x
ixp4xx
kirkwood
+ mv78xx0
orion5x
versatile
kernel-arch: arm
@@ -45,6 +46,13 @@
# QNAP TS-119/TS-219: 2097152 - 8 - 64 = 2097080
check-size: 2097080
+[mv78xx0_build]
+image-file: arch/arm/boot/zImage
+
+[mv78xx0_description]
+hardware: Marvell 78xx0
+hardware-long: Marvell DB-78xx0-BP Development Board
+
[orion5x_build]
image-file: arch/arm/boot/zImage
Modified: dists/squeeze-backports/linux-2.6/debian/config/config
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/config Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/config/config Fri Feb 10 03:23:57 2012 (r18675)
@@ -2039,7 +2039,8 @@
CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_MICREL_PHY=m
-CONFIG_FIXED_PHY=y
+#. Must only be enabled for specific flavours
+# CONFIG_FIXED_PHY is not set
CONFIG_MDIO_BITBANG=m
# CONFIG_MDIO_GPIO is not set
Modified: dists/squeeze-backports/linux-2.6/debian/config/defines
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/defines Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/config/defines Fri Feb 10 03:23:57 2012 (r18675)
@@ -1,5 +1,9 @@
[abi]
abiname: 0.bpo.1
+ignore-changes:
+ module:arch/x86/kvm/*
+ fixed_phy_add
+ fixed_phy_set_link_update
[base]
arches:
Modified: dists/squeeze-backports/linux-2.6/debian/config/m68k/defines
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/m68k/defines Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/config/m68k/defines Fri Feb 10 03:23:57 2012 (r18675)
@@ -1,5 +1,6 @@
[base]
-compiler: gcc-4.4
+compiler: gcc-4.6
+cflags: -ffreestanding
flavours:
amiga
atari
Modified: dists/squeeze-backports/linux-2.6/debian/config/mips/config.octeon
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/mips/config.octeon Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/config/mips/config.octeon Fri Feb 10 03:23:57 2012 (r18675)
@@ -93,6 +93,10 @@
CONFIG_OCTEON_MGMT_ETHERNET=y
##
+## file: drivers/net/phy/Kconfig
+##
+
+##
## file: drivers/rtc/Kconfig
##
CONFIG_RTC_DRV_DS1307=y
Modified: dists/squeeze-backports/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/mips/config.sb1-bcm91250a Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/config/mips/config.sb1-bcm91250a Fri Feb 10 03:23:57 2012 (r18675)
@@ -560,7 +560,6 @@
## file: drivers/net/phy/Kconfig
##
CONFIG_BROADCOM_PHY=y
-# CONFIG_FIXED_PHY is not set
##
## file: drivers/net/plip/Kconfig
Modified: dists/squeeze-backports/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Fri Feb 10 03:23:57 2012 (r18675)
@@ -566,7 +566,6 @@
## file: drivers/net/phy/Kconfig
##
CONFIG_BROADCOM_PHY=y
-# CONFIG_FIXED_PHY is not set
##
## file: drivers/net/plip/Kconfig
Modified: dists/squeeze-backports/linux-2.6/debian/installer/package-list
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/installer/package-list Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/installer/package-list Fri Feb 10 03:23:57 2012 (r18675)
@@ -289,12 +289,6 @@
Description: PCMCIA storage drivers
This package contains PCMCIA storage drivers for the kernel.
-Package: brltty-modules
-Depends: kernel-image, usb-modules
-Priority: extra
-Description: Braille support
- This package contains Braille drivers for the kernel.
-
Package: fb-modules
Depends: kernel-image
Priority: extra
Copied: dists/squeeze-backports/linux-2.6/debian/patches/bugfix/all/pci-rework-aspm-disable-code.patch (from r18667, dists/trunk/linux-2.6/debian/patches/bugfix/all/pci-rework-aspm-disable-code.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux-2.6/debian/patches/bugfix/all/pci-rework-aspm-disable-code.patch Fri Feb 10 03:23:57 2012 (r18675, copy of r18667, dists/trunk/linux-2.6/debian/patches/bugfix/all/pci-rework-aspm-disable-code.patch)
@@ -0,0 +1,228 @@
+From 3c076351c4027a56d5005a39a0b518a4ba393ce2 Mon Sep 17 00:00:00 2001
+From: Matthew Garrett <mjg at redhat.com>
+Date: Thu, 10 Nov 2011 16:38:33 -0500
+Subject: PCI: Rework ASPM disable code
+
+From: Matthew Garrett <mjg at redhat.com>
+
+commit 3c076351c4027a56d5005a39a0b518a4ba393ce2 upstream.
+
+Right now we forcibly clear ASPM state on all devices if the BIOS indicates
+that the feature isn't supported. Based on the Microsoft presentation
+"PCI Express In Depth for Windows Vista and Beyond", I'm starting to think
+that this may be an error. The implication is that unless the platform
+grants full control via _OSC, Windows will not touch any PCIe features -
+including ASPM. In that case clearing ASPM state would be an error unless
+the platform has granted us that control.
+
+This patch reworks the ASPM disabling code such that the actual clearing
+of state is triggered by a successful handoff of PCIe control to the OS.
+The general ASPM code undergoes some changes in order to ensure that the
+ability to clear the bits isn't overridden by ASPM having already been
+disabled. Further, this theoretically now allows for situations where
+only a subset of PCIe roots hand over control, leaving the others in the
+BIOS state.
+
+It's difficult to know for sure that this is the right thing to do -
+there's zero public documentation on the interaction between all of these
+components. But enough vendors enable ASPM on platforms and then set this
+bit that it seems likely that they're expecting the OS to leave them alone.
+
+Measured to save around 5W on an idle Thinkpad X220.
+
+Signed-off-by: Matthew Garrett <mjg at redhat.com>
+Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+
+---
+ drivers/acpi/pci_root.c | 7 +++++
+ drivers/pci/pci-acpi.c | 1
+ drivers/pci/pcie/aspm.c | 58 +++++++++++++++++++++++++++++------------------
+ include/linux/pci-aspm.h | 4 +--
+ 4 files changed, 46 insertions(+), 24 deletions(-)
+
+--- a/drivers/acpi/pci_root.c
++++ b/drivers/acpi/pci_root.c
+@@ -596,6 +596,13 @@ static int __devinit acpi_pci_root_add(s
+ if (ACPI_SUCCESS(status)) {
+ dev_info(root->bus->bridge,
+ "ACPI _OSC control (0x%02x) granted\n", flags);
++ if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_ASPM) {
++ /*
++ * We have ASPM control, but the FADT indicates
++ * that it's unsupported. Clear it.
++ */
++ pcie_clear_aspm(root->bus);
++ }
+ } else {
+ dev_info(root->bus->bridge,
+ "ACPI _OSC request failed (%s), "
+--- a/drivers/pci/pci-acpi.c
++++ b/drivers/pci/pci-acpi.c
+@@ -395,7 +395,6 @@ static int __init acpi_pci_init(void)
+
+ if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_ASPM) {
+ printk(KERN_INFO"ACPI FADT declares the system doesn't support PCIe ASPM, so disable it\n");
+- pcie_clear_aspm();
+ pcie_no_aspm();
+ }
+
+--- a/drivers/pci/pcie/aspm.c
++++ b/drivers/pci/pcie/aspm.c
+@@ -68,7 +68,7 @@ struct pcie_link_state {
+ struct aspm_latency acceptable[8];
+ };
+
+-static int aspm_disabled, aspm_force, aspm_clear_state;
++static int aspm_disabled, aspm_force;
+ static bool aspm_support_enabled = true;
+ static DEFINE_MUTEX(aspm_lock);
+ static LIST_HEAD(link_list);
+@@ -500,9 +500,6 @@ static int pcie_aspm_sanity_check(struct
+ int pos;
+ u32 reg32;
+
+- if (aspm_clear_state)
+- return -EINVAL;
+-
+ /*
+ * Some functions in a slot might not all be PCIe functions,
+ * very strange. Disable ASPM for the whole slot
+@@ -574,9 +571,6 @@ void pcie_aspm_init_link_state(struct pc
+ pdev->pcie_type != PCI_EXP_TYPE_DOWNSTREAM)
+ return;
+
+- if (aspm_disabled && !aspm_clear_state)
+- return;
+-
+ /* VIA has a strange chipset, root port is under a bridge */
+ if (pdev->pcie_type == PCI_EXP_TYPE_ROOT_PORT &&
+ pdev->bus->self)
+@@ -608,7 +602,7 @@ void pcie_aspm_init_link_state(struct pc
+ * the BIOS's expectation, we'll do so once pci_enable_device() is
+ * called.
+ */
+- if (aspm_policy != POLICY_POWERSAVE || aspm_clear_state) {
++ if (aspm_policy != POLICY_POWERSAVE) {
+ pcie_config_aspm_path(link);
+ pcie_set_clkpm(link, policy_to_clkpm_state(link));
+ }
+@@ -649,8 +643,7 @@ void pcie_aspm_exit_link_state(struct pc
+ struct pci_dev *parent = pdev->bus->self;
+ struct pcie_link_state *link, *root, *parent_link;
+
+- if ((aspm_disabled && !aspm_clear_state) || !pci_is_pcie(pdev) ||
+- !parent || !parent->link_state)
++ if (!pci_is_pcie(pdev) || !parent || !parent->link_state)
+ return;
+ if ((parent->pcie_type != PCI_EXP_TYPE_ROOT_PORT) &&
+ (parent->pcie_type != PCI_EXP_TYPE_DOWNSTREAM))
+@@ -734,13 +727,18 @@ void pcie_aspm_powersave_config_link(str
+ * pci_disable_link_state - disable pci device's link state, so the link will
+ * never enter specific states
+ */
+-static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)
++static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem,
++ bool force)
+ {
+ struct pci_dev *parent = pdev->bus->self;
+ struct pcie_link_state *link;
+
+- if (aspm_disabled || !pci_is_pcie(pdev))
++ if (aspm_disabled && !force)
++ return;
++
++ if (!pci_is_pcie(pdev))
+ return;
++
+ if (pdev->pcie_type == PCI_EXP_TYPE_ROOT_PORT ||
+ pdev->pcie_type == PCI_EXP_TYPE_DOWNSTREAM)
+ parent = pdev;
+@@ -768,16 +766,31 @@ static void __pci_disable_link_state(str
+
+ void pci_disable_link_state_locked(struct pci_dev *pdev, int state)
+ {
+- __pci_disable_link_state(pdev, state, false);
++ __pci_disable_link_state(pdev, state, false, false);
+ }
+ EXPORT_SYMBOL(pci_disable_link_state_locked);
+
+ void pci_disable_link_state(struct pci_dev *pdev, int state)
+ {
+- __pci_disable_link_state(pdev, state, true);
++ __pci_disable_link_state(pdev, state, true, false);
+ }
+ EXPORT_SYMBOL(pci_disable_link_state);
+
++void pcie_clear_aspm(struct pci_bus *bus)
++{
++ struct pci_dev *child;
++
++ /*
++ * Clear any ASPM setup that the firmware has carried out on this bus
++ */
++ list_for_each_entry(child, &bus->devices, bus_list) {
++ __pci_disable_link_state(child, PCIE_LINK_STATE_L0S |
++ PCIE_LINK_STATE_L1 |
++ PCIE_LINK_STATE_CLKPM,
++ false, true);
++ }
++}
++
+ static int pcie_aspm_set_policy(const char *val, struct kernel_param *kp)
+ {
+ int i;
+@@ -935,6 +948,7 @@ void pcie_aspm_remove_sysfs_dev_files(st
+ static int __init pcie_aspm_disable(char *str)
+ {
+ if (!strcmp(str, "off")) {
++ aspm_policy = POLICY_DEFAULT;
+ aspm_disabled = 1;
+ aspm_support_enabled = false;
+ printk(KERN_INFO "PCIe ASPM is disabled\n");
+@@ -947,16 +961,18 @@ static int __init pcie_aspm_disable(char
+
+ __setup("pcie_aspm=", pcie_aspm_disable);
+
+-void pcie_clear_aspm(void)
+-{
+- if (!aspm_force)
+- aspm_clear_state = 1;
+-}
+-
+ void pcie_no_aspm(void)
+ {
+- if (!aspm_force)
++ /*
++ * Disabling ASPM is intended to prevent the kernel from modifying
++ * existing hardware state, not to clear existing state. To that end:
++ * (a) set policy to POLICY_DEFAULT in order to avoid changing state
++ * (b) prevent userspace from changing policy
++ */
++ if (!aspm_force) {
++ aspm_policy = POLICY_DEFAULT;
+ aspm_disabled = 1;
++ }
+ }
+
+ /**
+--- a/include/linux/pci-aspm.h
++++ b/include/linux/pci-aspm.h
+@@ -29,7 +29,7 @@ extern void pcie_aspm_pm_state_change(st
+ extern void pcie_aspm_powersave_config_link(struct pci_dev *pdev);
+ extern void pci_disable_link_state(struct pci_dev *pdev, int state);
+ extern void pci_disable_link_state_locked(struct pci_dev *pdev, int state);
+-extern void pcie_clear_aspm(void);
++extern void pcie_clear_aspm(struct pci_bus *bus);
+ extern void pcie_no_aspm(void);
+ #else
+ static inline void pcie_aspm_init_link_state(struct pci_dev *pdev)
+@@ -47,7 +47,7 @@ static inline void pcie_aspm_powersave_c
+ static inline void pci_disable_link_state(struct pci_dev *pdev, int state)
+ {
+ }
+-static inline void pcie_clear_aspm(void)
++static inline void pcie_clear_aspm(struct pci_bus *bus)
+ {
+ }
+ static inline void pcie_no_aspm(void)
Copied: dists/squeeze-backports/linux-2.6/debian/patches/bugfix/x86/KVM-x86-extend-struct-x86_emulate_ops-with-get_cpuid.patch (from r18667, dists/trunk/linux-2.6/debian/patches/bugfix/x86/KVM-x86-extend-struct-x86_emulate_ops-with-get_cpuid.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux-2.6/debian/patches/bugfix/x86/KVM-x86-extend-struct-x86_emulate_ops-with-get_cpuid.patch Fri Feb 10 03:23:57 2012 (r18675, copy of r18667, dists/trunk/linux-2.6/debian/patches/bugfix/x86/KVM-x86-extend-struct-x86_emulate_ops-with-get_cpuid.patch)
@@ -0,0 +1,78 @@
+From: =?utf8?q?Stephan=20B=C3=A4rwolf?= <stephan.baerwolf at tu-ilmenau.de>
+Date: Thu, 12 Jan 2012 16:43:03 +0100
+Subject: [PATCH] KVM: x86: extend "struct x86_emulate_ops" with "get_cpuid"
+
+commit 0769c5de24621141c953fbe1f943582d37cb4244 upstream.
+
+In order to be able to proceed checks on CPU-specific properties
+within the emulator, function "get_cpuid" is introduced.
+With "get_cpuid" it is possible to virtually call the guests
+"cpuid"-opcode without changing the VM's context.
+
+[mtosatti: cleanup/beautify code]
+
+Signed-off-by: Stephan Baerwolf <stephan.baerwolf at tu-ilmenau.de>
+Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
+---
+ arch/x86/include/asm/kvm_emulate.h | 3 +++
+ arch/x86/kvm/x86.c | 23 +++++++++++++++++++++++
+ 2 files changed, 26 insertions(+), 0 deletions(-)
+
+diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
+index ab4092e..c8b2868 100644
+--- a/arch/x86/include/asm/kvm_emulate.h
++++ b/arch/x86/include/asm/kvm_emulate.h
+@@ -190,6 +190,9 @@ struct x86_emulate_ops {
+ int (*intercept)(struct x86_emulate_ctxt *ctxt,
+ struct x86_instruction_info *info,
+ enum x86_intercept_stage stage);
++
++ bool (*get_cpuid)(struct x86_emulate_ctxt *ctxt,
++ u32 *eax, u32 *ebx, u32 *ecx, u32 *edx);
+ };
+
+ typedef u32 __attribute__((vector_size(16))) sse128_t;
+diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
+index f0fa3fb..c95ca2d 100644
+--- a/arch/x86/kvm/x86.c
++++ b/arch/x86/kvm/x86.c
+@@ -4205,6 +4205,28 @@ static int emulator_intercept(struct x86_emulate_ctxt *ctxt,
+ return kvm_x86_ops->check_intercept(emul_to_vcpu(ctxt), info, stage);
+ }
+
++static bool emulator_get_cpuid(struct x86_emulate_ctxt *ctxt,
++ u32 *eax, u32 *ebx, u32 *ecx, u32 *edx)
++{
++ struct kvm_cpuid_entry2 *cpuid = NULL;
++
++ if (eax && ecx)
++ cpuid = kvm_find_cpuid_entry(emul_to_vcpu(ctxt),
++ *eax, *ecx);
++
++ if (cpuid) {
++ *eax = cpuid->eax;
++ *ecx = cpuid->ecx;
++ if (ebx)
++ *ebx = cpuid->ebx;
++ if (edx)
++ *edx = cpuid->edx;
++ return true;
++ }
++
++ return false;
++}
++
+ static struct x86_emulate_ops emulate_ops = {
+ .read_std = kvm_read_guest_virt_system,
+ .write_std = kvm_write_guest_virt_system,
+@@ -4236,6 +4258,7 @@ static struct x86_emulate_ops emulate_ops = {
+ .get_fpu = emulator_get_fpu,
+ .put_fpu = emulator_put_fpu,
+ .intercept = emulator_intercept,
++ .get_cpuid = emulator_get_cpuid,
+ };
+
+ static void cache_all_regs(struct kvm_vcpu *vcpu)
+--
+1.7.6.5
+
Copied: dists/squeeze-backports/linux-2.6/debian/patches/bugfix/x86/KVM-x86-fix-missing-checks-in-syscall-emulation.patch (from r18667, dists/trunk/linux-2.6/debian/patches/bugfix/x86/KVM-x86-fix-missing-checks-in-syscall-emulation.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux-2.6/debian/patches/bugfix/x86/KVM-x86-fix-missing-checks-in-syscall-emulation.patch Fri Feb 10 03:23:57 2012 (r18675, copy of r18667, dists/trunk/linux-2.6/debian/patches/bugfix/x86/KVM-x86-fix-missing-checks-in-syscall-emulation.patch)
@@ -0,0 +1,145 @@
+From: =?utf8?q?Stephan=20B=C3=A4rwolf?= <stephan.baerwolf at tu-ilmenau.de>
+Date: Thu, 12 Jan 2012 16:43:04 +0100
+Subject: [PATCH] KVM: x86: fix missing checks in syscall emulation
+
+commit e28ba7bb020f07193bc000453c8775e9d2c0dda7 upstream.
+
+On hosts without this patch, 32bit guests will crash (and 64bit guests
+may behave in a wrong way) for example by simply executing following
+nasm-demo-application:
+
+ [bits 32]
+ global _start
+ SECTION .text
+ _start: syscall
+
+(I tested it with winxp and linux - both always crashed)
+
+ Disassembly of section .text:
+
+ 00000000 <_start>:
+ 0: 0f 05 syscall
+
+The reason seems a missing "invalid opcode"-trap (int6) for the
+syscall opcode "0f05", which is not available on Intel CPUs
+within non-longmodes, as also on some AMD CPUs within legacy-mode.
+(depending on CPU vendor, MSR_EFER and cpuid)
+
+Because previous mentioned OSs may not engage corresponding
+syscall target-registers (STAR, LSTAR, CSTAR), they remain
+NULL and (non trapping) syscalls are leading to multiple
+faults and finally crashs.
+
+Depending on the architecture (AMD or Intel) pretended by
+guests, various checks according to vendor's documentation
+are implemented to overcome the current issue and behave
+like the CPUs physical counterparts.
+
+[mtosatti: cleanup/beautify code]
+
+Signed-off-by: Stephan Baerwolf <stephan.baerwolf at tu-ilmenau.de>
+Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
+---
+ arch/x86/include/asm/kvm_emulate.h | 13 +++++++++
+ arch/x86/kvm/emulate.c | 51 ++++++++++++++++++++++++++++++++++++
+ 2 files changed, 64 insertions(+), 0 deletions(-)
+
+diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
+index c8b2868..7b9cfc4 100644
+--- a/arch/x86/include/asm/kvm_emulate.h
++++ b/arch/x86/include/asm/kvm_emulate.h
+@@ -301,6 +301,19 @@ struct x86_emulate_ctxt {
+ #define X86EMUL_MODE_PROT (X86EMUL_MODE_PROT16|X86EMUL_MODE_PROT32| \
+ X86EMUL_MODE_PROT64)
+
++/* CPUID vendors */
++#define X86EMUL_CPUID_VENDOR_AuthenticAMD_ebx 0x68747541
++#define X86EMUL_CPUID_VENDOR_AuthenticAMD_ecx 0x444d4163
++#define X86EMUL_CPUID_VENDOR_AuthenticAMD_edx 0x69746e65
++
++#define X86EMUL_CPUID_VENDOR_AMDisbetterI_ebx 0x69444d41
++#define X86EMUL_CPUID_VENDOR_AMDisbetterI_ecx 0x21726574
++#define X86EMUL_CPUID_VENDOR_AMDisbetterI_edx 0x74656273
++
++#define X86EMUL_CPUID_VENDOR_GenuineIntel_ebx 0x756e6547
++#define X86EMUL_CPUID_VENDOR_GenuineIntel_ecx 0x6c65746e
++#define X86EMUL_CPUID_VENDOR_GenuineIntel_edx 0x49656e69
++
+ enum x86_intercept_stage {
+ X86_ICTP_NONE = 0, /* Allow zero-init to not match anything */
+ X86_ICPT_PRE_EXCEPT,
+diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
+index 05a562b..0982507 100644
+--- a/arch/x86/kvm/emulate.c
++++ b/arch/x86/kvm/emulate.c
+@@ -1891,6 +1891,51 @@ setup_syscalls_segments(struct x86_emulate_ctxt *ctxt,
+ ss->p = 1;
+ }
+
++static bool em_syscall_is_enabled(struct x86_emulate_ctxt *ctxt)
++{
++ struct x86_emulate_ops *ops = ctxt->ops;
++ u32 eax, ebx, ecx, edx;
++
++ /*
++ * syscall should always be enabled in longmode - so only become
++ * vendor specific (cpuid) if other modes are active...
++ */
++ if (ctxt->mode == X86EMUL_MODE_PROT64)
++ return true;
++
++ eax = 0x00000000;
++ ecx = 0x00000000;
++ if (ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx)) {
++ /*
++ * Intel ("GenuineIntel")
++ * remark: Intel CPUs only support "syscall" in 64bit
++ * longmode. Also an 64bit guest with a
++ * 32bit compat-app running will #UD !! While this
++ * behaviour can be fixed (by emulating) into AMD
++ * response - CPUs of AMD can't behave like Intel.
++ */
++ if (ebx == X86EMUL_CPUID_VENDOR_GenuineIntel_ebx &&
++ ecx == X86EMUL_CPUID_VENDOR_GenuineIntel_ecx &&
++ edx == X86EMUL_CPUID_VENDOR_GenuineIntel_edx)
++ return false;
++
++ /* AMD ("AuthenticAMD") */
++ if (ebx == X86EMUL_CPUID_VENDOR_AuthenticAMD_ebx &&
++ ecx == X86EMUL_CPUID_VENDOR_AuthenticAMD_ecx &&
++ edx == X86EMUL_CPUID_VENDOR_AuthenticAMD_edx)
++ return true;
++
++ /* AMD ("AMDisbetter!") */
++ if (ebx == X86EMUL_CPUID_VENDOR_AMDisbetterI_ebx &&
++ ecx == X86EMUL_CPUID_VENDOR_AMDisbetterI_ecx &&
++ edx == X86EMUL_CPUID_VENDOR_AMDisbetterI_edx)
++ return true;
++ }
++
++ /* default: (not Intel, not AMD), apply Intel's stricter rules... */
++ return false;
++}
++
+ static int em_syscall(struct x86_emulate_ctxt *ctxt)
+ {
+ struct x86_emulate_ops *ops = ctxt->ops;
+@@ -1904,9 +1949,15 @@ static int em_syscall(struct x86_emulate_ctxt *ctxt)
+ ctxt->mode == X86EMUL_MODE_VM86)
+ return emulate_ud(ctxt);
+
++ if (!(em_syscall_is_enabled(ctxt)))
++ return emulate_ud(ctxt);
++
+ ops->get_msr(ctxt, MSR_EFER, &efer);
+ setup_syscalls_segments(ctxt, &cs, &ss);
+
++ if (!(efer & EFER_SCE))
++ return emulate_ud(ctxt);
++
+ ops->get_msr(ctxt, MSR_STAR, &msr_data);
+ msr_data >>= 32;
+ cs_sel = (u16)(msr_data & 0xfffc);
+--
+1.7.6.5
+
Modified: dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-add.patch
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-add.patch Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-add.patch Fri Feb 10 03:23:57 2012 (r18675)
@@ -1,5 +1,5 @@
--- a/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/Kconfig 2011-10-29 11:40:05.615788191 +0100
++++ b/fs/aufs/Kconfig 2012-01-10 02:15:56.545455955 +0000
@@ -0,0 +1,203 @@
+config AUFS_FS
+ tristate "Aufs (Advanced multi layered unification filesystem) support"
@@ -205,8 +205,8 @@
+ When aufs supports Magic SysRq, enabled automatically.
+endif
--- a/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/Makefile 2011-10-29 11:40:05.615788191 +0100
-@@ -0,0 +1,38 @@
++++ b/fs/aufs/Makefile 2012-01-10 02:15:56.545455955 +0000
+@@ -0,0 +1,42 @@
+
+include ${src}/magic.mk
+ifeq (${CONFIG_AUFS_FS},m)
@@ -217,8 +217,12 @@
+# cf. include/linux/kernel.h
+# enable pr_debug
+ccflags-y += -DDEBUG
-+# sparse doesn't allow spaces
-+ccflags-y += -D'pr_fmt(fmt)=AUFS_NAME"\040%s:%d:%s[%d]:\040"fmt,__func__,__LINE__,current->comm,current->pid'
++# sparse requires the full pathname
++ifdef M
++ccflags-y += -include ${M}/../../include/linux/aufs_type.h
++else
++ccflags-y += -include ${srctree}/include/linux/aufs_type.h
++endif
+
+obj-$(CONFIG_AUFS_FS) += aufs.o
+aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o \
@@ -246,10 +250,10 @@
+aufs-$(CONFIG_AUFS_DEBUG) += debug.o
+aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
--- a/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/aufs.h 2011-10-29 11:40:05.615788191 +0100
++++ b/fs/aufs/aufs.h 2012-01-10 02:15:56.545455955 +0000
@@ -0,0 +1,60 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -309,10 +313,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_H__ */
--- a/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/branch.c 2011-10-29 11:40:05.615788191 +0100
-@@ -0,0 +1,1170 @@
++++ b/fs/aufs/branch.c 2012-01-10 02:15:56.545455955 +0000
+@@ -0,0 +1,1169 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -334,7 +338,6 @@
+ */
+
+#include <linux/compat.h>
-+#include <linux/file.h>
+#include <linux/statfs.h>
+#include "aufs.h"
+
@@ -1482,10 +1485,10 @@
+ return err;
+}
--- a/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/branch.h 2011-10-29 11:40:05.615788191 +0100
-@@ -0,0 +1,232 @@
++++ b/fs/aufs/branch.h 2012-01-10 02:15:56.545455955 +0000
+@@ -0,0 +1,230 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -1511,9 +1514,7 @@
+
+#ifdef __KERNEL__
+
-+#include <linux/fs.h>
+#include <linux/mount.h>
-+#include <linux/aufs_type.h>
+#include "dynop.h"
+#include "rwsem.h"
+#include "super.h"
@@ -1717,7 +1718,7 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_BRANCH_H__ */
--- a/fs/aufs/conf.mk 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/conf.mk 2011-10-29 11:40:05.615788191 +0100
++++ b/fs/aufs/conf.mk 2012-01-10 02:15:56.545455955 +0000
@@ -0,0 +1,38 @@
+
+AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS}
@@ -1758,10 +1759,10 @@
+
+-include ${srctree}/${src}/conf_priv.mk
--- a/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/cpup.c 2011-11-19 23:25:01.975822834 +0000
-@@ -0,0 +1,1081 @@
++++ b/fs/aufs/cpup.c 2012-01-10 02:15:56.545455955 +0000
+@@ -0,0 +1,1079 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -1782,10 +1783,8 @@
+ * copy-up functions, see wbr_policy.c for copy-down
+ */
+
-+#include <linux/file.h>
+#include <linux/fs_stack.h>
+#include <linux/mm.h>
-+#include <linux/uaccess.h>
+#include "aufs.h"
+
+void au_cpup_attr_flags(struct inode *dst, struct inode *src)
@@ -2842,10 +2841,10 @@
+ return err;
+}
--- a/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/cpup.h 2011-10-29 11:40:05.615788191 +0100
-@@ -0,0 +1,83 @@
++++ b/fs/aufs/cpup.h 2012-01-10 02:15:56.545455955 +0000
+@@ -0,0 +1,81 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -2872,8 +2871,6 @@
+#ifdef __KERNEL__
+
+#include <linux/path.h>
-+#include <linux/time.h>
-+#include <linux/aufs_type.h>
+
+struct inode;
+struct file;
@@ -2928,10 +2925,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_CPUP_H__ */
--- a/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dbgaufs.c 2011-11-19 23:25:01.975822834 +0000
++++ b/fs/aufs/dbgaufs.c 2012-01-10 02:15:56.545455955 +0000
@@ -0,0 +1,334 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -3265,10 +3262,10 @@
+ return err;
+}
--- a/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dbgaufs.h 2011-10-29 11:40:05.615788191 +0100
-@@ -0,0 +1,52 @@
++++ b/fs/aufs/dbgaufs.h 2012-01-10 02:15:56.545455955 +0000
+@@ -0,0 +1,49 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -3294,9 +3291,6 @@
+
+#ifdef __KERNEL__
+
-+#include <linux/init.h>
-+#include <linux/aufs_type.h>
-+
+struct super_block;
+struct au_sbinfo;
+
@@ -3320,10 +3314,10 @@
+#endif /* __KERNEL__ */
+#endif /* __DBGAUFS_H__ */
--- a/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dcsub.c 2011-10-29 11:40:05.615788191 +0100
++++ b/fs/aufs/dcsub.c 2012-01-10 02:15:56.545455955 +0000
@@ -0,0 +1,243 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -3566,10 +3560,10 @@
+ return path_is_under(path + 0, path + 1);
+}
--- a/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dcsub.h 2011-10-29 11:40:05.615788191 +0100
-@@ -0,0 +1,95 @@
++++ b/fs/aufs/dcsub.h 2012-01-10 02:15:56.545455955 +0000
+@@ -0,0 +1,94 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -3597,7 +3591,6 @@
+
+#include <linux/dcache.h>
+#include <linux/fs.h>
-+#include <linux/types.h>
+
+struct dentry;
+
@@ -3664,10 +3657,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DCSUB_H__ */
--- a/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/debug.c 2011-10-29 11:40:05.615788191 +0100
-@@ -0,0 +1,490 @@
++++ b/fs/aufs/debug.c 2012-01-10 02:15:56.545455955 +0000
+@@ -0,0 +1,489 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -3688,7 +3681,6 @@
+ * debug print functions
+ */
+
-+#include <linux/module.h>
+#include <linux/vt_kern.h>
+#include "aufs.h"
+
@@ -4157,10 +4149,10 @@
+ return 0;
+}
--- a/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/debug.h 2011-10-29 11:40:05.615788191 +0100
-@@ -0,0 +1,252 @@
++++ b/fs/aufs/debug.h 2012-01-10 02:15:56.545455955 +0000
+@@ -0,0 +1,243 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -4187,18 +4179,9 @@
+#ifdef __KERNEL__
+
+#include <asm/system.h>
-+#include <linux/bug.h>
-+/* #include <linux/err.h> */
-+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kallsyms.h>
-+/* #include <linux/kernel.h> */
-+#include <linux/delay.h>
-+/* #include <linux/kd.h> */
+#include <linux/sysrq.h>
-+#include <linux/aufs_type.h>
-+
-+#include <asm/system.h>
+
+#ifdef CONFIG_AUFS_DEBUG
+#define AuDebugOn(a) BUG_ON(a)
@@ -4412,10 +4395,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DEBUG_H__ */
--- a/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dentry.c 2011-10-29 11:40:05.615788191 +0100
++++ b/fs/aufs/dentry.c 2012-01-10 02:15:56.545455955 +0000
@@ -0,0 +1,1140 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -5555,10 +5538,10 @@
+ .d_release = aufs_d_release
+};
--- a/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dentry.h 2011-10-29 11:40:05.615788191 +0100
-@@ -0,0 +1,238 @@
++++ b/fs/aufs/dentry.h 2012-01-10 02:15:56.549455982 +0000
+@@ -0,0 +1,237 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -5585,7 +5568,6 @@
+#ifdef __KERNEL__
+
+#include <linux/dcache.h>
-+#include <linux/aufs_type.h>
+#include "rwsem.h"
+
+struct au_hdentry {
@@ -5796,10 +5778,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DENTRY_H__ */
--- a/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dinfo.c 2011-10-29 11:40:05.615788191 +0100
++++ b/fs/aufs/dinfo.c 2012-01-10 02:15:56.549455982 +0000
@@ -0,0 +1,543 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -6342,10 +6324,10 @@
+ return -1;
+}
--- a/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dir.c 2011-11-19 23:25:01.975822834 +0000
-@@ -0,0 +1,635 @@
++++ b/fs/aufs/dir.c 2012-01-10 02:15:56.549455982 +0000
+@@ -0,0 +1,634 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -6366,7 +6348,6 @@
+ * directory operations
+ */
+
-+#include <linux/file.h>
+#include <linux/fs_stack.h>
+#include "aufs.h"
+
@@ -6980,10 +6961,10 @@
+ .fsync = aufs_fsync_dir
+};
--- a/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dir.h 2011-10-29 11:40:05.619788223 +0100
-@@ -0,0 +1,138 @@
++++ b/fs/aufs/dir.h 2012-01-10 02:15:56.549455982 +0000
+@@ -0,0 +1,137 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7010,7 +6991,6 @@
+#ifdef __KERNEL__
+
+#include <linux/fs.h>
-+#include <linux/aufs_type.h>
+
+/* ---------------------------------------------------------------------- */
+
@@ -7121,10 +7101,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DIR_H__ */
--- a/fs/aufs/dynop.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dynop.c 2011-10-29 11:40:05.619788223 +0100
++++ b/fs/aufs/dynop.c 2012-01-10 02:15:56.549455982 +0000
@@ -0,0 +1,377 @@
+/*
-+ * Copyright (C) 2010-2011 Junjiro R. Okajima
++ * Copyright (C) 2010-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7501,10 +7481,10 @@
+ WARN_ON(!list_empty(&dynop[i].head));
+}
--- a/fs/aufs/dynop.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/dynop.h 2011-10-29 11:40:05.619788223 +0100
-@@ -0,0 +1,80 @@
++++ b/fs/aufs/dynop.h 2012-01-10 02:15:56.549455982 +0000
+@@ -0,0 +1,76 @@
+/*
-+ * Copyright (C) 2010-2011 Junjiro R. Okajima
++ * Copyright (C) 2010-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7530,10 +7510,6 @@
+
+#ifdef __KERNEL__
+
-+#include <linux/fs.h>
-+#include <linux/mm.h>
-+#include <linux/rcupdate.h>
-+#include <linux/aufs_type.h>
+#include "inode.h"
+
+enum {AuDy_AOP, AuDyLast};
@@ -7584,10 +7560,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DYNOP_H__ */
--- a/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/export.c 2011-10-29 11:40:05.619788223 +0100
-@@ -0,0 +1,805 @@
++++ b/fs/aufs/export.c 2012-01-10 02:15:56.549455982 +0000
+@@ -0,0 +1,804 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7609,7 +7585,6 @@
+ */
+
+#include <linux/exportfs.h>
-+#include <linux/file.h>
+#include <linux/mnt_namespace.h>
+#include <linux/namei.h>
+#include <linux/nsproxy.h>
@@ -8392,10 +8367,10 @@
+ atomic_set(&sbinfo->si_xigen_next, u);
+}
--- a/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/f_op.c 2011-11-19 23:25:01.975822834 +0000
-@@ -0,0 +1,731 @@
++++ b/fs/aufs/f_op.c 2012-01-10 02:15:56.549455982 +0000
+@@ -0,0 +1,729 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -8416,10 +8391,8 @@
+ * file and vm operations
+ */
+
-+#include <linux/file.h>
+#include <linux/fs_stack.h>
+#include <linux/mman.h>
-+#include <linux/mm.h>
+#include <linux/security.h>
+#include "aufs.h"
+
@@ -9126,10 +9099,10 @@
+#endif
+};
--- a/fs/aufs/f_op_sp.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/f_op_sp.c 2011-10-29 11:40:05.619788223 +0100
-@@ -0,0 +1,299 @@
++++ b/fs/aufs/f_op_sp.c 2012-01-10 02:15:56.549455982 +0000
+@@ -0,0 +1,298 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -9152,7 +9125,6 @@
+ * their file I/O is handled out of aufs.
+ */
+
-+#include <linux/fs_stack.h>
+#include "aufs.h"
+
+static ssize_t aufs_aio_read_sp(struct kiocb *kio, const struct iovec *iov,
@@ -9428,10 +9400,10 @@
+ return ret;
+}
--- a/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/file.c 2011-10-29 11:40:05.619788223 +0100
-@@ -0,0 +1,676 @@
++++ b/fs/aufs/file.c 2012-01-10 02:15:56.549455982 +0000
+@@ -0,0 +1,673 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -9452,9 +9424,6 @@
+ * handling file/dir, and address_space operation
+ */
+
-+#include <linux/file.h>
-+#include <linux/fsnotify.h>
-+#include <linux/namei.h>
+#include <linux/pagemap.h>
+#include "aufs.h"
+
@@ -10107,10 +10076,10 @@
+#endif /* CONFIG_AUFS_DEBUG */
+};
--- a/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/file.h 2011-10-29 11:40:05.619788223 +0100
-@@ -0,0 +1,299 @@
++++ b/fs/aufs/file.h 2012-01-10 02:15:56.549455982 +0000
+@@ -0,0 +1,298 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -10139,7 +10108,6 @@
+#include <linux/file.h>
+#include <linux/fs.h>
+#include <linux/poll.h>
-+#include <linux/aufs_type.h>
+#include "rwsem.h"
+
+struct au_branch;
@@ -10409,10 +10377,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_FILE_H__ */
--- a/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/finfo.c 2011-11-19 23:25:01.975822834 +0000
-@@ -0,0 +1,157 @@
++++ b/fs/aufs/finfo.c 2012-01-10 02:15:56.549455982 +0000
+@@ -0,0 +1,156 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -10433,7 +10401,6 @@
+ * file private data
+ */
+
-+#include <linux/file.h>
+#include "aufs.h"
+
+void au_hfput(struct au_hfile *hf, struct file *file)
@@ -10569,10 +10536,10 @@
+ return err;
+}
--- a/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/fstype.h 2011-10-29 11:40:05.619788223 +0100
-@@ -0,0 +1,497 @@
++++ b/fs/aufs/fstype.h 2012-01-10 02:15:56.553455997 +0000
+@@ -0,0 +1,496 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -10601,7 +10568,6 @@
+#include <linux/fs.h>
+#include <linux/magic.h>
+#include <linux/romfs_fs.h>
-+#include <linux/aufs_type.h>
+
+static inline int au_test_aufs(struct super_block *sb)
+{
@@ -11069,10 +11035,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_FSTYPE_H__ */
--- a/fs/aufs/hfsnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/hfsnotify.c 2011-10-29 11:40:05.619788223 +0100
++++ b/fs/aufs/hfsnotify.c 2012-01-10 02:15:56.553455997 +0000
@@ -0,0 +1,247 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -11319,10 +11285,10 @@
+ .init_br = au_hfsn_init_br
+};
--- a/fs/aufs/hfsplus.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/hfsplus.c 2011-10-29 11:40:05.619788223 +0100
-@@ -0,0 +1,58 @@
++++ b/fs/aufs/hfsplus.c 2012-01-10 02:15:56.553455997 +0000
+@@ -0,0 +1,57 @@
+/*
-+ * Copyright (C) 2010-2011 Junjiro R. Okajima
++ * Copyright (C) 2010-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -11349,7 +11315,6 @@
+ * and au_h_open_post() after releasing it.
+ */
+
-+#include <linux/file.h>
+#include "aufs.h"
+
+struct file *au_h_open_pre(struct dentry *dentry, aufs_bindex_t bindex)
@@ -11380,10 +11345,10 @@
+ }
+}
--- a/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/hnotify.c 2011-10-29 11:40:05.619788223 +0100
++++ b/fs/aufs/hnotify.c 2012-01-10 02:15:56.553455997 +0000
@@ -0,0 +1,712 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12095,10 +12060,10 @@
+ au_hn_destroy_cache();
+}
--- a/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/i_op.c 2011-11-19 23:25:01.975822834 +0000
-@@ -0,0 +1,994 @@
++++ b/fs/aufs/i_op.c 2012-01-10 02:15:56.553455997 +0000
+@@ -0,0 +1,992 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12121,10 +12086,8 @@
+
+#include <linux/device_cgroup.h>
+#include <linux/fs_stack.h>
-+#include <linux/mm.h>
+#include <linux/namei.h>
+#include <linux/security.h>
-+#include <linux/uaccess.h>
+#include "aufs.h"
+
+static int h_permission(struct inode *h_inode, int mask,
@@ -13092,10 +13055,10 @@
+ .truncate_range = aufs_truncate_range
+};
--- a/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/i_op_add.c 2011-10-29 11:40:05.619788223 +0100
++++ b/fs/aufs/i_op_add.c 2012-01-10 02:15:56.553455997 +0000
@@ -0,0 +1,711 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -13806,10 +13769,10 @@
+ return err;
+}
--- a/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/i_op_del.c 2011-10-29 11:40:05.619788223 +0100
++++ b/fs/aufs/i_op_del.c 2012-01-10 02:15:56.557456016 +0000
@@ -0,0 +1,478 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -14287,10 +14250,10 @@
+ return err;
+}
--- a/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/i_op_ren.c 2011-10-29 11:40:05.619788223 +0100
++++ b/fs/aufs/i_op_ren.c 2012-01-10 02:15:56.557456016 +0000
@@ -0,0 +1,1017 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -15307,10 +15270,10 @@
+ return err;
+}
--- a/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/iinfo.c 2011-10-29 11:40:05.619788223 +0100
++++ b/fs/aufs/iinfo.c 2012-01-10 02:15:56.557456016 +0000
@@ -0,0 +1,264 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -15574,10 +15537,10 @@
+ AuRwDestroy(&iinfo->ii_rwsem);
+}
--- a/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/inode.c 2011-10-29 11:40:05.619788223 +0100
++++ b/fs/aufs/inode.c 2012-01-10 02:15:56.557456016 +0000
@@ -0,0 +1,471 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -16048,10 +16011,10 @@
+ return au_test_h_perm(h_inode, mask);
+}
--- a/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/inode.h 2011-10-29 11:40:05.619788223 +0100
-@@ -0,0 +1,556 @@
++++ b/fs/aufs/inode.h 2012-01-10 02:15:56.557456016 +0000
+@@ -0,0 +1,554 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -16077,9 +16040,7 @@
+
+#ifdef __KERNEL__
+
-+#include <linux/fs.h>
+#include <linux/fsnotify.h>
-+#include <linux/aufs_type.h>
+#include "rwsem.h"
+
+struct vfsmount;
@@ -16607,10 +16568,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_INODE_H__ */
--- a/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/ioctl.c 2011-10-29 11:40:05.619788223 +0100
-@@ -0,0 +1,197 @@
++++ b/fs/aufs/ioctl.c 2012-01-10 02:15:56.557456016 +0000
+@@ -0,0 +1,196 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -16633,7 +16594,6 @@
+ * assist the pathconf(3) wrapper library.
+ */
+
-+#include <linux/file.h>
+#include "aufs.h"
+
+static int au_wbr_fd(struct path *path, struct aufs_wbr_fd __user *arg)
@@ -16807,10 +16767,10 @@
+#endif
+#endif
--- a/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/loop.c 2011-10-29 11:40:05.619788223 +0100
++++ b/fs/aufs/loop.c 2012-01-10 02:15:56.557456016 +0000
@@ -0,0 +1,133 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -16943,10 +16903,10 @@
+ kfree(au_warn_loopback_array);
+}
--- a/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/loop.h 2011-10-29 11:40:05.619788223 +0100
++++ b/fs/aufs/loop.h 2012-01-10 02:15:56.557456016 +0000
@@ -0,0 +1,50 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -16996,7 +16956,7 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_LOOP_H__ */
--- a/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/magic.mk 2011-10-29 11:40:05.619788223 +0100
++++ b/fs/aufs/magic.mk 2012-01-10 02:15:56.557456016 +0000
@@ -0,0 +1,54 @@
+
+# defined in ${srctree}/fs/fuse/inode.c
@@ -17053,10 +17013,10 @@
+ccflags-y += -DHFSPLUS_SUPER_MAGIC=0x482b
+endif
--- a/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/module.c 2011-11-19 23:25:01.975822834 +0000
++++ b/fs/aufs/module.c 2012-01-10 02:15:56.557456016 +0000
@@ -0,0 +1,195 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -17251,10 +17211,10 @@
+module_init(aufs_init);
+module_exit(aufs_exit);
--- a/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/module.h 2011-11-19 23:25:01.975822834 +0000
++++ b/fs/aufs/module.h 2012-01-10 02:15:56.557456016 +0000
@@ -0,0 +1,107 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -17361,10 +17321,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_MODULE_H__ */
--- a/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/opts.c 2011-11-19 23:25:01.979822863 +0000
-@@ -0,0 +1,1679 @@
++++ b/fs/aufs/opts.c 2012-01-10 02:15:56.561456041 +0000
+@@ -0,0 +1,1677 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -17385,8 +17345,6 @@
+ * mount options/flags
+ */
+
-+#include <linux/file.h>
-+#include <linux/jiffies.h>
+#include <linux/namei.h>
+#include <linux/types.h> /* a distribution requires */
+#include <linux/parser.h>
@@ -19043,10 +19001,10 @@
+ return au_mntflags(sb) & AuOptMask_UDBA;
+}
--- a/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/opts.h 2011-10-29 11:40:05.623788233 +0100
-@@ -0,0 +1,210 @@
++++ b/fs/aufs/opts.h 2012-01-10 02:15:56.561456041 +0000
+@@ -0,0 +1,209 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -19073,7 +19031,6 @@
+#ifdef __KERNEL__
+
+#include <linux/path.h>
-+#include <linux/aufs_type.h>
+
+struct file;
+struct super_block;
@@ -19256,10 +19213,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_OPTS_H__ */
--- a/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/plink.c 2011-10-29 11:40:05.623788233 +0100
++++ b/fs/aufs/plink.c 2012-01-10 02:15:56.561456041 +0000
@@ -0,0 +1,515 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -19774,10 +19731,10 @@
+ }
+}
--- a/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/poll.c 2011-10-29 11:40:05.623788233 +0100
++++ b/fs/aufs/poll.c 2012-01-10 02:15:56.561456041 +0000
@@ -0,0 +1,56 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -19833,10 +19790,10 @@
+ return mask;
+}
--- a/fs/aufs/procfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/procfs.c 2011-11-19 23:25:01.979822863 +0000
++++ b/fs/aufs/procfs.c 2012-01-10 02:15:56.561456041 +0000
@@ -0,0 +1,170 @@
+/*
-+ * Copyright (C) 2010-2011 Junjiro R. Okajima
++ * Copyright (C) 2010-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -20006,10 +19963,10 @@
+ return err;
+}
--- a/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/rdu.c 2011-11-19 23:25:01.979822863 +0000
-@@ -0,0 +1,385 @@
++++ b/fs/aufs/rdu.c 2012-01-10 02:15:56.561456041 +0000
+@@ -0,0 +1,383 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -20033,8 +19990,6 @@
+#include <linux/compat.h>
+#include <linux/fs_stack.h>
+#include <linux/security.h>
-+#include <linux/uaccess.h>
-+#include <linux/aufs_type.h>
+#include "aufs.h"
+
+/* bits for struct aufs_rdu.flags */
@@ -20394,10 +20349,10 @@
+}
+#endif
--- a/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/rwsem.h 2011-10-29 11:40:05.623788233 +0100
-@@ -0,0 +1,189 @@
++++ b/fs/aufs/rwsem.h 2012-01-10 02:15:56.561456041 +0000
+@@ -0,0 +1,188 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -20423,7 +20378,6 @@
+
+#ifdef __KERNEL__
+
-+#include <linux/rwsem.h>
+#include "debug.h"
+
+struct au_rwsem {
@@ -20586,10 +20540,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_RWSEM_H__ */
--- a/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/sbinfo.c 2011-10-29 11:40:05.623788233 +0100
-@@ -0,0 +1,344 @@
++++ b/fs/aufs/sbinfo.c 2012-01-10 02:15:56.561456041 +0000
+@@ -0,0 +1,343 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -20610,7 +20564,6 @@
+ * superblock private data
+ */
+
-+#include <linux/jiffies.h>
+#include "aufs.h"
+
+/*
@@ -20933,10 +20886,10 @@
+ spin_unlock(&sbinfo->au_si_pid.tree_lock);
+}
--- a/fs/aufs/spl.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/spl.h 2011-10-29 11:40:05.623788233 +0100
-@@ -0,0 +1,66 @@
++++ b/fs/aufs/spl.h 2012-01-10 02:15:56.561456041 +0000
+@@ -0,0 +1,62 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -20962,10 +20915,6 @@
+
+#ifdef __KERNEL__
+
-+#include <linux/spinlock.h>
-+#include <linux/list.h>
-+#include <linux/rculist.h>
-+
+struct au_splhead {
+ spinlock_t spin;
+ struct list_head head;
@@ -21002,10 +20951,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_SPL_H__ */
--- a/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/super.c 2011-11-19 23:25:01.979822863 +0000
-@@ -0,0 +1,939 @@
++++ b/fs/aufs/super.c 2012-01-10 02:15:56.569456073 +0000
+@@ -0,0 +1,938 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -21026,8 +20975,7 @@
+ * mount and super_block operations
+ */
+
-+#include <linux/buffer_head.h>
-+#include <linux/jiffies.h>
++#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/seq_file.h>
+#include <linux/statfs.h>
@@ -21944,10 +21892,10 @@
+ .owner = THIS_MODULE,
+};
--- a/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/super.h 2011-10-29 11:40:05.623788233 +0100
-@@ -0,0 +1,547 @@
++++ b/fs/aufs/super.h 2012-01-10 02:15:56.569456073 +0000
+@@ -0,0 +1,546 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -21974,7 +21922,6 @@
+#ifdef __KERNEL__
+
+#include <linux/fs.h>
-+#include <linux/aufs_type.h>
+#include "rwsem.h"
+#include "spl.h"
+#include "wkq.h"
@@ -22494,10 +22441,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_SUPER_H__ */
--- a/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/sysaufs.c 2011-10-29 11:40:05.623788233 +0100
-@@ -0,0 +1,107 @@
++++ b/fs/aufs/sysaufs.c 2012-01-10 02:15:56.569456073 +0000
+@@ -0,0 +1,105 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -22519,9 +22466,7 @@
+ * they are necessary regardless sysfs is disabled.
+ */
+
-+#include <linux/fs.h>
+#include <linux/random.h>
-+#include <linux/sysfs.h>
+#include "aufs.h"
+
+unsigned long sysaufs_si_mask;
@@ -22604,10 +22549,10 @@
+ return err;
+}
--- a/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/sysaufs.h 2011-10-29 11:40:05.623788233 +0100
-@@ -0,0 +1,105 @@
++++ b/fs/aufs/sysaufs.h 2012-01-10 02:15:56.569456073 +0000
+@@ -0,0 +1,104 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -22634,7 +22579,6 @@
+#ifdef __KERNEL__
+
+#include <linux/sysfs.h>
-+#include <linux/aufs_type.h>
+#include "module.h"
+
+struct super_block;
@@ -22712,10 +22656,10 @@
+#endif /* __KERNEL__ */
+#endif /* __SYSAUFS_H__ */
--- a/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/sysfs.c 2011-11-19 23:25:01.979822863 +0000
-@@ -0,0 +1,260 @@
++++ b/fs/aufs/sysfs.c 2012-01-10 02:15:56.569456073 +0000
+@@ -0,0 +1,257 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -22736,10 +22680,7 @@
+ * sysfs interface
+ */
+
-+#include <linux/fs.h>
-+#include <linux/module.h>
+#include <linux/seq_file.h>
-+#include <linux/sysfs.h>
+#include "aufs.h"
+
+#ifdef CONFIG_AUFS_FS_MODULE
@@ -22975,10 +22916,10 @@
+ }
+}
--- a/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/sysrq.c 2011-10-29 11:40:05.623788233 +0100
-@@ -0,0 +1,151 @@
++++ b/fs/aufs/sysrq.c 2012-01-10 02:15:56.569456073 +0000
+@@ -0,0 +1,148 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -22999,9 +22940,6 @@
+ * magic sysrq hanlder
+ */
+
-+#include <linux/fs.h>
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
+/* #include <linux/sysrq.h> */
+#include <linux/writeback.h>
+#include "aufs.h"
@@ -23129,10 +23067,10 @@
+ pr_err("err %d (ignored)\n", err);
+}
--- a/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/vdir.c 2011-10-29 11:40:05.623788233 +0100
-@@ -0,0 +1,886 @@
++++ b/fs/aufs/vdir.c 2012-01-10 02:15:56.569456073 +0000
+@@ -0,0 +1,885 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -23153,7 +23091,6 @@
+ * virtual or vertical directory
+ */
+
-+#include <linux/hash.h>
+#include "aufs.h"
+
+static unsigned int calc_size(int nlen)
@@ -24018,10 +23955,10 @@
+ return 0;
+}
--- a/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/vfsub.c 2011-11-19 23:25:01.979822863 +0000
-@@ -0,0 +1,837 @@
++++ b/fs/aufs/vfsub.c 2012-01-10 02:15:56.569456073 +0000
+@@ -0,0 +1,835 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24042,12 +23979,10 @@
+ * sub-routines for VFS
+ */
+
-+#include <linux/file.h>
+#include <linux/ima.h>
+#include <linux/namei.h>
+#include <linux/security.h>
+#include <linux/splice.h>
-+#include <linux/uaccess.h>
+#include "aufs.h"
+
+int vfsub_update_h_iattr(struct path *h_path, int *did)
@@ -24858,10 +24793,10 @@
+ return err;
+}
--- a/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/vfsub.h 2011-10-29 11:40:05.623788233 +0100
++++ b/fs/aufs/vfsub.h 2012-01-10 02:15:56.569456073 +0000
@@ -0,0 +1,232 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -25093,10 +25028,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_VFSUB_H__ */
--- a/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/wbr_policy.c 2011-10-29 11:40:05.623788233 +0100
++++ b/fs/aufs/wbr_policy.c 2012-01-10 02:15:56.569456073 +0000
@@ -0,0 +1,700 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -25796,10 +25731,10 @@
+ }
+};
--- a/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/whout.c 2011-10-29 11:40:05.623788233 +0100
-@@ -0,0 +1,1050 @@
++++ b/fs/aufs/whout.c 2012-01-10 02:15:56.573456100 +0000
+@@ -0,0 +1,1049 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -25820,7 +25755,6 @@
+ * whiteout for logical deletion and opaque directory
+ */
+
-+#include <linux/fs.h>
+#include "aufs.h"
+
+#define WH_MASK S_IRUGO
@@ -26849,10 +26783,10 @@
+ }
+}
--- a/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/whout.h 2011-10-29 11:40:05.623788233 +0100
-@@ -0,0 +1,89 @@
++++ b/fs/aufs/whout.h 2012-01-10 02:15:56.573456100 +0000
+@@ -0,0 +1,88 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -26878,7 +26812,6 @@
+
+#ifdef __KERNEL__
+
-+#include <linux/aufs_type.h>
+#include "dir.h"
+
+/* whout.c */
@@ -26941,10 +26874,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_WHOUT_H__ */
--- a/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/wkq.c 2011-11-19 23:25:01.979822863 +0000
++++ b/fs/aufs/wkq.c 2012-01-10 02:15:56.573456100 +0000
@@ -0,0 +1,214 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -27158,10 +27091,10 @@
+ return err;
+}
--- a/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/wkq.h 2011-11-19 23:25:01.979822863 +0000
-@@ -0,0 +1,96 @@
++++ b/fs/aufs/wkq.h 2012-01-10 02:15:56.573456100 +0000
+@@ -0,0 +1,92 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -27188,10 +27121,6 @@
+
+#ifdef __KERNEL__
+
-+#include <linux/sched.h>
-+#include <linux/wait.h>
-+#include <linux/aufs_type.h>
-+
+struct super_block;
+
+/* ---------------------------------------------------------------------- */
@@ -27257,10 +27186,10 @@
+#endif /* __KERNEL__ */
+#endif /* __AUFS_WKQ_H__ */
--- a/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/xino.c 2011-11-19 23:25:01.979822863 +0000
-@@ -0,0 +1,1266 @@
++++ b/fs/aufs/xino.c 2012-01-10 02:15:56.573456100 +0000
+@@ -0,0 +1,1264 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -27281,9 +27210,7 @@
+ * external inode number translation table and bitmap
+ */
+
-+#include <linux/file.h>
+#include <linux/seq_file.h>
-+#include <linux/uaccess.h>
+#include "aufs.h"
+
+/* todo: unnecessary to support mmap_sem since kernel-space? */
@@ -28526,10 +28453,10 @@
+ return err;
+}
--- a/include/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ b/include/linux/aufs_type.h 2011-11-19 23:25:01.979822863 +0000
-@@ -0,0 +1,224 @@
++++ b/include/linux/aufs_type.h 2012-01-10 02:15:56.573456100 +0000
+@@ -0,0 +1,233 @@
+/*
-+ * Copyright (C) 2005-2011 Junjiro R. Okajima
++ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -28549,17 +28476,27 @@
+#ifndef __AUFS_TYPE_H__
+#define __AUFS_TYPE_H__
+
-+#include <linux/ioctl.h>
-+#include <linux/kernel.h>
-+#include <linux/limits.h>
++#define AUFS_NAME "aufs"
++
+#ifdef __KERNEL__
-+#include <linux/types.h>
++/*
++ * define it before including all other headers.
++ * sched.h may use pr_* macros before defining "current", so define the
++ * no-current version first, and re-define later.
++ */
++#define pr_fmt(fmt) AUFS_NAME " %s:%d: " fmt, __func__, __LINE__
++#include <linux/sched.h>
++#undef pr_fmt
++#define pr_fmt(fmt) AUFS_NAME " %s:%d:%s[%d]: " fmt, \
++ __func__, __LINE__, current->comm, current->pid
+#else
+#include <stdint.h>
+#include <sys/types.h>
-+#endif
++#endif /* __KERNEL__ */
++
++#include <linux/limits.h>
+
-+#define AUFS_VERSION "3.x-rcN-20111114"
++#define AUFS_VERSION "3.2-20120109"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -28588,7 +28525,6 @@
+
+/* ---------------------------------------------------------------------- */
+
-+#define AUFS_NAME "aufs"
+#define AUFS_FSTYPE AUFS_NAME
+
+#define AUFS_ROOT_INO 2
Modified: dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-base.patch
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-base.patch Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-base.patch Fri Feb 10 03:23:57 2012 (r18675)
@@ -1,10 +1,10 @@
-aufs3.x-rcN base patch
+aufs3.2 base patch
diff --git a/fs/namei.c b/fs/namei.c
-index ac6d214..f72b667 100644
+index 5008f01..4cc94cf 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -1750,7 +1750,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
+@@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
* needs parent already locked. Doesn't follow mounts.
* SMP-safe.
*/
Modified: dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-kbuild.patch
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-kbuild.patch Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-kbuild.patch Fri Feb 10 03:23:57 2012 (r18675)
@@ -1,4 +1,4 @@
-aufs3.x-rcN kbuild patch
+aufs3.2 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
index 5f4c45d..357a8a6 100644
Modified: dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-standalone.patch
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-standalone.patch Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/patches/features/all/aufs3/aufs3-standalone.patch Fri Feb 10 03:23:57 2012 (r18675)
@@ -1,4 +1,4 @@
-aufs3.x-rcN standalone patch
+aufs3.2 standalone patch
diff --git a/fs/file_table.c b/fs/file_table.c
index c322794..2aad244 100644
@@ -26,10 +26,10 @@
/*
* Empty aops. Can be used for the cases where the user does not
diff --git a/fs/namei.c b/fs/namei.c
-index f72b667..7a58222 100644
+index 4cc94cf..af19e30 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -1754,6 +1754,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1757,6 +1757,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
{
return __lookup_hash(&nd->last, nd->path.dentry, nd);
}
@@ -38,10 +38,10 @@
/**
* lookup_one_len - filesystem helper to lookup single pathname component
diff --git a/fs/namespace.c b/fs/namespace.c
-index e5e1c7d..344999b 100644
+index cfc6d44..173d15a 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1509,6 +1509,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1506,6 +1506,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
@@ -152,10 +152,18 @@
}
+EXPORT_SYMBOL_GPL(cap_file_mmap);
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index 4450fbe..2c437e5 100644
+index 4450fbe..bc94175 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
-@@ -500,6 +500,7 @@ found:
+@@ -7,6 +7,7 @@
+ #include <linux/device_cgroup.h>
+ #include <linux/cgroup.h>
+ #include <linux/ctype.h>
++#include <linux/export.h>
+ #include <linux/list.h>
+ #include <linux/uaccess.h>
+ #include <linux/seq_file.h>
+@@ -500,6 +501,7 @@ found:
return -EPERM;
}
@@ -164,7 +172,7 @@
int devcgroup_inode_mknod(int mode, dev_t dev)
{
diff --git a/security/security.c b/security/security.c
-index 0c6cc69..d58ba1b 100644
+index e2f684a..892000c 100644
--- a/security/security.c
+++ b/security/security.c
@@ -411,6 +411,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
Modified: dists/squeeze-backports/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/patches/series/base Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/patches/series/base Fri Feb 10 03:23:57 2012 (r18675)
@@ -59,20 +59,18 @@
+ bugfix/all/cpu-Register-a-generic-CPU-device-on-architectures-t.patch
+ debian/x86-memtest-WARN-if-bad-RAM-found.patch
+ bugfix/all/snapshot-Implement-compat_ioctl.patch
-+ bugfix/all/rtc-Fix-alarm-rollover-when-day-or-month-is-out-of-r.patch
-+ bugfix/all/media-V4L-DVB-v4l2-ioctl-integer-overflow-in-video_usercopy.patch
+ debian/ARM-Remove-use-of-possibly-undefined-BUILD_BUG_ON-in.patch
+ bugfix/arm/ARM-ixp4xx-gpiolib-support.patch
+ bugfix/arm/ARM-topdown-mmap.patch
+ bugfix/alpha/alpha-add-io-read-write-16-32-be-functions.patch
+ features/arm/ARM-kirkwood-6282A1.patch
-+ bugfix/all/net-reintroduce-missing-rcu_assign_pointer-calls.patch
-+ bugfix/all/block-add-and-use-scsi_blk_cmd_ioctl.patch
-+ bugfix/all/block-fail-SCSI-passthrough-ioctls-on-partition-devi.patch
-+ bugfix/all/dm-do-not-forward-ioctls-from-logical-volumes-to-the.patch
+ features/all/Input-ALPS-move-protocol-information-to-Documentatio.patch
+ features/all/Input-ALPS-add-protocol-version-field-in-alps_model_.patch
+ features/all/Input-ALPS-remove-assumptions-about-packet-size.patch
+ features/all/Input-ALPS-add-support-for-protocol-versions-3-and-4.patch
+ features/all/Input-ALPS-add-semi-MT-support-for-v3-protocol.patch
-+ bugfix/all/proc-clean-up-and-fix-proc-pid-mem-handling.patch
++ bugfix/x86/KVM-nVMX-Add-KVM_REQ_IMMEDIATE_EXIT.patch
++ bugfix/x86/KVM-nVMX-Fix-warning-causing-idt-vectoring-info-beha.patch
++ bugfix/x86/KVM-x86-extend-struct-x86_emulate_ops-with-get_cpuid.patch
++ bugfix/x86/KVM-x86-fix-missing-checks-in-syscall-emulation.patch
++ bugfix/all/pci-rework-aspm-disable-code.patch
Modified: dists/squeeze-backports/linux-2.6/debian/rules.real
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/rules.real Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/rules.real Fri Feb 10 03:23:57 2012 (r18675)
@@ -82,8 +82,6 @@
mkdir -p '$(DIR)'
cp -al $(SOURCE_FILES) '$(DIR)'
$(patch_cmd)
- # Suppress trailing '+' in utsrelease
- touch '$(DIR)/.scmversion'
@$(stamp)
$(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET): SOURCE_DIR=$(BUILD_DIR)/source
@@ -114,7 +112,8 @@
echo 'endif' >> '$(DIR)/.kernelvariables'
endif
ifdef CFLAGS_KERNEL
- echo 'CFLAGS += $(CFLAGS_KERNEL)' >> '$(DIR)/.kernelvariables'
+ echo 'CFLAGS_KERNEL += $(CFLAGS_KERNEL)' >> '$(DIR)/.kernelvariables'
+ echo 'CFLAGS_MODULE += $(CFLAGS_KERNEL)' >> '$(DIR)/.kernelvariables'
endif
+$(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' V=1 listnewconfig
+yes "" | $(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' oldconfig >/dev/null
Modified: dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/postinst Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/postinst Fri Feb 10 03:23:57 2012 (r18675)
@@ -22,9 +22,6 @@
my $postinst_hook = ''; #Normally we do not
my $minimal_swap = ''; # Do not swap symlinks
my $ignore_depmod_err = ''; # normally we do not
-my $relink_src_link = 'YES'; # There is no harm in checking the link
-my $relink_build_link = 'YES'; # There is no harm in checking the link
-my $force_build_link = ''; # There is no harm in checking the link
my $kernel_arch = "=B";
my $ramdisk = '';
my $package_name = "linux-image-$version";
@@ -61,9 +58,6 @@
$use_hard_links = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i;
$minimal_swap = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i;
$ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i;
- $relink_src_link = '' if /relink_src_link\s*=\s*(no|false|0)\s*$/i;
- $relink_build_link = '' if /relink_build_link\s*=\s*(no|false|0)\s*$/i;
- $force_build_link = '' if /force_build_link\s*=\s*(no|false|0)\s*$/i;
$do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i;
$no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i;
@@ -71,9 +65,6 @@
$use_hard_links = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i;
$minimal_swap = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i;
$ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
- $relink_src_link = 'Yes' if /relink_src_link\s*=\s*(yes|true|1)\s*$/i;
- $relink_build_link = 'Yes' if /relink_build_link\s*=\s*(yes|true|1)\s*$/i;
- $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/i;
$image_dest = "$1" if /image_dest\s*=\s*(\S+)/i;
$postinst_hook = "$1" if /postinst_hook\s*=\s*(\S+)/i;
@@ -117,75 +108,6 @@
######################################################################
-## Fix the build link
-######################################################################
-sub fix_build_link {
- return unless -d "$modules_base/$version";
- # if we saved a build link in preinst, restore the link
- if (! -e "$modules_base/$version/build" &&
- -l "$modules_base/$version/build.save" ) {
- rename("$modules_base/$version/build.save", "$modules_base/$version/build") ||
- die "failed to move $modules_base/$version/build:$!";
- }
- if ($relink_build_link || $force_build_link) {
- my $build_target;
- my $real_target = '';
- if (-l "$modules_base/$version/build") {
- $build_target = readlink "$modules_base/$version/build";
- } else {
- return;
- }
- # Determine what the real file name is, and test that for existence
- $real_target = abs_path($build_target) if defined($build_target);
- if (!defined($build_target) || ! -d "$real_target") { # Danglink link
- my $num = unlink "$modules_base/$version/build";
- if ($num != 1) {
- warn "error unlinking $modules_base/$version/build";
- } else {
- if ($force_build_link || -d "/usr/src/linux-headers-$version") {
- my $result = symlink ("/usr/src/linux-headers-$version",
- "$modules_base/$version/build");
- if (! $result) {
- warn "Could not link /usr/src/linux-headers-$version to $modules_base/$version/build:$!"
- }
- }
- }
- }
- }
-}
-
-if ($relink_build_link || $force_build_link) {
- &fix_build_link();
-}
-######################################################################
-## Fix the source link
-######################################################################
-sub fix_source_link {
- return unless -d "$modules_base/$version";
- if ($relink_src_link) {
- my $source_target;
- my $real_target = '';
-
- if (-l "$modules_base/$version/source") {
- $source_target = readlink "$modules_base/$version/source";
- } else {
- return;
- }
- # Determine what the real file name is, and test that for existence
- $real_target = abs_path($source_target) if defined($source_target);
- if (!defined($source_target) || ! -d "$real_target") { # Danglink link
- my $num = unlink "$modules_base/$version/source";
- if ($num != 1) {
- warn "error unlinking $modules_base/$version/source";
- }
- }
- }
-}
-
-if ($relink_src_link) {
- &fix_source_link();
-}
-######################################################################
######################################################################
########### Test whether a relative symlinkwould be OK #######
######################################################################
Modified: dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/postrm
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/postrm Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/postrm Fri Feb 10 03:23:57 2012 (r18675)
@@ -21,17 +21,9 @@
# Predefined values:
my $version = "=V";
my $link_in_boot = "";
-my $no_symlink = "";
-my $do_symlink = "Yes"; # target machine defined
-my $do_boot_enable = "Yes"; # target machine defined
my $kimage = "=K";
my $initrd = "=I"; # initrd kernel
-my $use_hard_links = ''; # hardlinks do not work across fs boundaries
my $postrm_hook = ''; #Normally we do not
-my $minimal_swap = ''; # Do not swap symlinks
-my $ignore_depmod_err = ''; # normally we do not
-my $relink_build_link = 'YES'; # There is no harm in checking the link
-my $force_build_link = ''; # we shall not create a dangling link
my $kernel_arch = "=B";
my $ramdisk = "=MK"; # List of tools to create initial ram fs.
my $package_name = "linux-image-$version";
@@ -51,24 +43,9 @@
s/\#.*$//g;
next if /^\s*$/;
- $do_symlink = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/i;
- $no_symlink = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/i;
$link_in_boot = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i;
- $do_boot_enable = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/i;
- $use_hard_links = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i;
- $minimal_swap = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i;
- $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i;
- $relink_build_link = '' if /relink_build_link\s*=\s*(no|false|0)\s*$/i;
- $force_build_link = '' if /force_build_link\s*=\s*(no|false|0)\s*$/i;
- $do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i;
- $no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i;
$link_in_boot = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i;
- $use_hard_links = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i;
- $minimal_swap = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i;
- $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
- $relink_build_link = 'Yes' if /relink_build_link\s*=\s*(yes|true|1)\s*$/i;
- $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/i;
$image_dest = "$1" if /image_dest\s*=\s*(\S+)/i;
$postrm_hook = "$1" if /postrm_hook\s*=\s*(\S+)/i;
@@ -275,15 +252,14 @@
modules.generic_string modules.ieee1394map
modules.ieee1394map modules.pnpbiosmap
modules.alias modules.ccwmap modules.inputmap
- modules.symbols build source modules.ofmap
- modules.seriomap modules.alias.bin
- modules.dep.bin modules.symbols.bin
+ modules.symbols modules.ofmap
+ modules.seriomap modules.*.bin
modules.softdep modules.devname
};
foreach my $extra_file (@files_to_remove) {
- if (-f "/lib/modules/$version/$extra_file") {
- unlink "/lib/modules/$version/$extra_file";
+ for (glob("/lib/modules/$version/$extra_file")) {
+ unlink;
}
}
Modified: dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/preinst
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/preinst Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/preinst Fri Feb 10 03:23:57 2012 (r18675)
@@ -11,23 +11,12 @@
# Predefined values:
my $version = "=V";
-my $link_in_boot = "";
-my $no_symlink = "";
-my $do_symlink = "Yes"; # target machine defined
my $kimage = "=K";
-my $use_hard_links = ''; # hardlinks do not wirk across fs boundaries
my $preinst_hook = ''; #Normally we do not
-my $minimal_swap = ''; # Do not swap symlinks
-my $ignore_depmod_err = ''; # normally we do not
-my $relink_src_link = 'YES'; # There is no harm in checking the link
-my $relink_build_link = 'YES'; # There is no harm in checking the link
-my $force_build_link = ''; # There is no harm in checking the link
my $kernel_arch = "=B";
-my $ramdisk = "=MK"; # List of tools to create initial ram fs.
my $package_name = "linux-image-$version";
#known variables
-my $image_dest = "/";
my $realimageloc = "/boot/";
my $CONF_LOC = '/etc/kernel-img.conf';
@@ -45,29 +34,7 @@
s/\#.*$//g;
next if /^\s*$/;
- $do_symlink = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/i;
- $no_symlink = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/i;
- $link_in_boot = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i;
- $use_hard_links = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i;
- $minimal_swap = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i;
- $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i;
- $relink_src_link = '' if /relink_src_link\s*=\s*(no|false|0)\s*$/i;
- $relink_build_link = '' if /relink_build_link\s*=\s*(no|false|0)\s*$/i;
- $force_build_link = '' if /force_build_link\s*=\s*(no|false|0)\s*$/i;
-
- $do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i;
- $no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i;
- $link_in_boot = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i;
- $use_hard_links = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i;
- $minimal_swap = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i;
- $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
- $relink_src_link = 'Yes' if /relink_src_link\s*=\s*(yes|true|1)\s*$/i;
- $relink_build_link = 'Yes' if /relink_build_link\s*=\s*(yes|true|1)\s*$/i;
- $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/i;
-
- $image_dest = "$1" if /image_dest\s*=\s*(\S+)/i;
$preinst_hook = "$1" if /preinst_hook\s*=\s*(\S+)/i;
- $ramdisk = "$1" if /ramdisk\s*=\s*(.+)$/i;
}
close CONF;
}
@@ -76,11 +43,6 @@
$ENV{KERNEL_ARCH}=$kernel_arch if $kernel_arch;
-if (-d "$modules_base/$version" && -l "$modules_base/$version/build" ) {
- rename("$modules_base/$version/build", "$modules_base/$version/build.save") ||
- die "failed to move $modules_base/$version/build:$!";
-}
-
# set the env var stem
$ENV{'STEM'} = "linux";
Modified: dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/prerm
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/prerm Fri Feb 10 02:32:52 2012 (r18674)
+++ dists/squeeze-backports/linux-2.6/debian/templates/temp.image.plain/prerm Fri Feb 10 03:23:57 2012 (r18675)
@@ -9,22 +9,12 @@
$|=1;
# Predefined values:
my $version = "=V";
-my $link_in_boot = "";
-my $no_symlink = "";
-my $do_symlink = "Yes"; # target machine defined
-my $do_boot_enable = "Yes"; # target machine defined
my $kimage = "=K";
-my $use_hard_links = ''; # hardlinks do not wirk across fs boundaries
my $prerm_hook = ''; #Normally we do not
-my $minimal_swap = ''; # Do not swap symlinks
-my $ignore_depmod_err = ''; # normally we do not
-my $relink_build_link = 'YES'; # There is no harm in checking the link
-my $force_build_link = ''; # There is no harm in checking the link
my $kernel_arch = "=B";
my $package_name = "linux-image-$version";
#known variables
-my $image_dest = "/";
my $realimageloc = "/boot/";
my $CONF_LOC = '/etc/kernel-img.conf';
@@ -36,12 +26,6 @@
my $running = '';
my $WouldInvalidate = 0;
-if ($ARGV[0] && ($ARGV[0] =~ /remove/ || $ARGV[0] =~ /upgrade/)) {
- if (-l "/usr/doc/linux-image-$version") {
- unlink "/usr/doc/linux-image-$version";
- }
-}
-
# Ignore all invocations uxcept when called on to remove
exit 0 unless ($ARGV[0] && $ARGV[0] =~ /remove/) ;
@@ -52,28 +36,6 @@
s/\#.*$//g;
next if /^\s*$/;
- $do_symlink = "" if /do_symlinks\s*=\s*(no|false|0)\s*$/i;
- $no_symlink = "" if /no_symlinks\s*=\s*(no|false|0)\s*$/i;
- $link_in_boot = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i;
- $do_boot_enable = '' if /do_boot_enable\s*=\s*(no|false|0)\s*$/i;
- $use_hard_links = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i;
- $minimal_swap = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i;
- $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i;
- $relink_build_link = '' if /relink_build_link\s*=\s*(no|false|0)\s*$/i;
- $force_build_link = '' if /force_build_link\s*=\s*(no|false|0)\s*$/i;
-
-
- $do_symlink = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i;
- $no_symlink = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i;
- $link_in_boot = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i;
- $do_boot_enable = "Yes" if /do_boot_enable\s*=\s*(yes|true|1)\s*$/i;
- $use_hard_links = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i;
- $minimal_swap = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i;
- $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
- $relink_build_link = 'Yes' if /relink_build_link\s*=\s*(yes|true|1)\s*$/i;
- $force_build_link = 'Yes' if /force_build_link\s*=\s*(yes|true|1)\s*$/i;
-
- $image_dest = "$1" if /image_dest\s*=\s*(\S+)/i;
$prerm_hook = "$1" if /prerm_hook\s*=\s*(\S+)/i;
}
close CONF;
More information about the Kernel-svn-changes
mailing list