[kernel] r10659 - dists/trunk/linux-2.6/debian/patches/series
Author: tbm Date: Tue Feb 26 09:11:01 2008 New Revision: 10659 Log: not sure about this anymore :( Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 == --- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (original) +++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1Tue Feb 26 09:11:01 2008 @@ -29,5 +29,4 @@ + bugfix/arm/disable-ath5k.patch + bugfix/arm/disable-r6040.patch + features/all/at76.patch -#the following will be fixed before 2.6.25 is out: + bugfix/arm/ignore-invalid-memtags.patch ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10660 - in dists/trunk/linux-2.6/debian: . config/arm config/armel
Author: tbm Date: Tue Feb 26 09:42:21 2008 New Revision: 10660 Log: [arm/armel] Unset CRYPTO_DEV_HIFN_795X since it causes a build failure. Modified: dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/config/arm/config dists/trunk/linux-2.6/debian/config/armel/config Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Tue Feb 26 09:42:21 2008 @@ -34,6 +34,7 @@ [ Martin Michlmayr ] * [arm] Add a kernel for Orion based devices, such as the QNAP TS-109/TS-209. + * [arm/armel] Unset CRYPTO_DEV_HIFN_795X since it causes a build failure. [ Daniel Baumann ] * Added patch from unionfs upstream to export release_open_intent symbol. Modified: dists/trunk/linux-2.6/debian/config/arm/config == --- dists/trunk/linux-2.6/debian/config/arm/config (original) +++ dists/trunk/linux-2.6/debian/config/arm/config Tue Feb 26 09:42:21 2008 @@ -26,3 +26,4 @@ # CONFIG_SCSI_QLA_ISCSI is not set # CONFIG_SCSI_AIC94XX is not set # CONFIG_SCSI_HPTIOP is not set +# CONFIG_CRYPTO_DEV_HIFN_795X is not set Modified: dists/trunk/linux-2.6/debian/config/armel/config == --- dists/trunk/linux-2.6/debian/config/armel/config(original) +++ dists/trunk/linux-2.6/debian/config/armel/configTue Feb 26 09:42:21 2008 @@ -15,3 +15,4 @@ CONFIG_TMPFS=y CONFIG_AEABI=y CONFIG_OABI_COMPAT=y +# CONFIG_CRYPTO_DEV_HIFN_795X is not set ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10661 - in dists/trunk/linux-2.6/debian: . config/armel
Author: tbm Date: Tue Feb 26 09:43:51 2008 New Revision: 10661 Log: Add the Orion kernel on armel too Modified: dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/config/armel/defines Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Tue Feb 26 09:43:51 2008 @@ -1,4 +1,4 @@ -linux-2.6 (2.6.25~rc3-1~experimental.1) UNRELEASED; urgency=low +iinux-2.6 (2.6.25~rc3-1~experimental.1) UNRELEASED; urgency=low * New upstream release (closes: #456799) @@ -32,7 +32,7 @@ * postinst: Nuke confusing postinst message. (closes: #465512) [ Martin Michlmayr ] - * [arm] Add a kernel for Orion based devices, such as the QNAP + * [arm/armel] Add a kernel for Orion based devices, such as the QNAP TS-109/TS-209. * [arm/armel] Unset CRYPTO_DEV_HIFN_795X since it causes a build failure. Modified: dists/trunk/linux-2.6/debian/config/armel/defines == --- dists/trunk/linux-2.6/debian/config/armel/defines (original) +++ dists/trunk/linux-2.6/debian/config/armel/defines Tue Feb 26 09:43:51 2008 @@ -2,6 +2,7 @@ flavours: iop32x ixp4xx + orion versatile kernel-arch: arm @@ -23,6 +24,13 @@ [ixp4xx_image] configs: arm/config.ixp4xx +[orion_base] +class: Orion +longclass: Orion based (QNAP TS-109/TS-209, etc) + +[orion_image] +configs: arm/config.orion + [versatile_base] class: Versatile longclass: Versatile (PB, AB, Qemu) ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10662 - in dists/trunk/linux-2.6/debian: . patches/bugfix/arm patches/series
Author: tbm
Date: Tue Feb 26 10:21:13 2008
New Revision: 10662
Log:
pad ssb structures to allow ARM cross-compilation
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/arm/pad-ssb-structure.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Tue Feb 26 10:21:13 2008
@@ -35,6 +35,8 @@
* [arm/armel] Add a kernel for Orion based devices, such as the QNAP
TS-109/TS-209.
* [arm/armel] Unset CRYPTO_DEV_HIFN_795X since it causes a build failure.
+ * [arm] Pad the SSB structure so crossing-compiling a kernel for ARM
+ won't fail because of sanity checks; patch from Gordon Farquharson.
[ Daniel Baumann ]
* Added patch from unionfs upstream to export release_open_intent symbol.
Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/pad-ssb-structure.patch
==
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/pad-ssb-structure.patch
Tue Feb 26 10:21:13 2008
@@ -0,0 +1,39 @@
+Align the members of the SSB device structure to a 32 bit boundary so
+that the b43 driver can be built for arm using a cross compiler. This
+alignment is required so that the test in scripts/mod/file2alias.c
+that checks that the size of the device ID type against the size of
+the section in the object file succeeds (see comment and
+http://lkml.org/lkml/2008/2/18/481 for explanation).
+
+This fixes:
+
+ MODPOST 972 modules
+FATAL: drivers/net/wireless/b43/b43: sizeof(struct ssb_device_id)=6 is not a
modulo of the size of section __mod_ssb_device_table=64.
+Fix definition of struct ssb_device_id in mod_devicetable.h
+make[5]: *** [__modpost] Error 1
+make[4]: *** [modules] Error 2
+
+Signed-off-by: Gordon Farquharson [EMAIL PROTECTED]
+
+---
+
+diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
+index 139d49d..208d49a 100644
+--- a/include/linux/mod_devicetable.h
b/include/linux/mod_devicetable.h
+@@ -351,7 +351,13 @@ struct sdio_device_id {
+ struct ssb_device_id {
+ __u16 vendor;
+ __u16 coreid;
+- __u8revision;
++ /* Explicit padding to support a broken sanity check in file2alias.c.
++ * The check compares the size of the structure in the kernel
++ * object file to the size of the structure reported in userspace for
++ * the system on which the kernel is compiled. The check breaks on
++ * cross-compilation, and the padding is a workaround for this. */
++ __u8revision
++ __attribute__((aligned(sizeof(__u32;
+ };
+ #define SSB_DEVICE(_vendor, _coreid, _revision) \
+ { .vendor = _vendor, .coreid = _coreid, .revision = _revision, }
+
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1Tue Feb
26 10:21:13 2008
@@ -30,3 +30,4 @@
+ bugfix/arm/disable-r6040.patch
+ features/all/at76.patch
+ bugfix/arm/ignore-invalid-memtags.patch
++ bugfix/arm/pad-ssb-structure.patch
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10663 - in dists/trunk/linux-2.6/debian: . config/arm config/armel patches/bugfix patches/series
Author: tbm Date: Tue Feb 26 12:26:06 2008 New Revision: 10663 Log: [arm/mips] Disable CRYPTO_DEV_HIFN_795X since it doesn't compile. Added: dists/trunk/linux-2.6/debian/patches/bugfix/disable-hifn_795X.patch Modified: dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/config/arm/config dists/trunk/linux-2.6/debian/config/armel/config dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Tue Feb 26 12:26:06 2008 @@ -34,9 +34,9 @@ [ Martin Michlmayr ] * [arm/armel] Add a kernel for Orion based devices, such as the QNAP TS-109/TS-209. - * [arm/armel] Unset CRYPTO_DEV_HIFN_795X since it causes a build failure. * [arm] Pad the SSB structure so crossing-compiling a kernel for ARM won't fail because of sanity checks; patch from Gordon Farquharson. + * [arm/mips] Disable CRYPTO_DEV_HIFN_795X since it doesn't compile. [ Daniel Baumann ] * Added patch from unionfs upstream to export release_open_intent symbol. Modified: dists/trunk/linux-2.6/debian/config/arm/config == --- dists/trunk/linux-2.6/debian/config/arm/config (original) +++ dists/trunk/linux-2.6/debian/config/arm/config Tue Feb 26 12:26:06 2008 @@ -26,4 +26,3 @@ # CONFIG_SCSI_QLA_ISCSI is not set # CONFIG_SCSI_AIC94XX is not set # CONFIG_SCSI_HPTIOP is not set -# CONFIG_CRYPTO_DEV_HIFN_795X is not set Modified: dists/trunk/linux-2.6/debian/config/armel/config == --- dists/trunk/linux-2.6/debian/config/armel/config(original) +++ dists/trunk/linux-2.6/debian/config/armel/configTue Feb 26 12:26:06 2008 @@ -15,4 +15,3 @@ CONFIG_TMPFS=y CONFIG_AEABI=y CONFIG_OABI_COMPAT=y -# CONFIG_CRYPTO_DEV_HIFN_795X is not set Added: dists/trunk/linux-2.6/debian/patches/bugfix/disable-hifn_795X.patch == --- (empty file) +++ dists/trunk/linux-2.6/debian/patches/bugfix/disable-hifn_795X.patch Tue Feb 26 12:26:06 2008 @@ -0,0 +1,14 @@ + Building modules, stage 2. + MODPOST 759 modules +ERROR: __divdi3 [drivers/crypto/hifn_795x.ko] undefined! + +--- a/drivers/crypto/Kconfig 2008-02-26 09:14:14.0 + b/drivers/crypto/Kconfig 2008-02-26 09:15:11.0 + +@@ -149,6 +149,7 @@ + select CRYPTO_BLKCIPHER + select HW_RANDOM if CRYPTO_DEV_HIFN_795X_RNG + depends on PCI ++ depends on (!MIPS !ARM) || BROKEN + help + This option allows you to have support for HIFN 795x crypto adapters. + Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 == --- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (original) +++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1Tue Feb 26 12:26:06 2008 @@ -31,3 +31,4 @@ + features/all/at76.patch + bugfix/arm/ignore-invalid-memtags.patch + bugfix/arm/pad-ssb-structure.patch ++ bugfix/disable-hifn_795X.patch ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10664 - in dists/sid/linux-2.6/debian: . bin config/s390
Author: waldi
Date: Tue Feb 26 13:43:29 2008
New Revision: 10664
Log:
* debian/bin/gencontrol.py: Add minimal support for localversion overrides.
* debian/changelog: Update.
* debian/config/s390/defines: Override localversion for tape image.
* debian/rules.real: Don't build modules for plain-s390-tape.
Modified:
dists/sid/linux-2.6/debian/bin/gencontrol.py
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/config/s390/defines
dists/sid/linux-2.6/debian/rules.real
Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==
--- dists/sid/linux-2.6/debian/bin/gencontrol.py(original)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.pyTue Feb 26 13:43:29 2008
@@ -78,7 +78,15 @@
makefile.add('source_%s_%s_real' % (arch, featureset), cmds =
cmds_source)
def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour,
extra):
-vars.update(self.config.merge('image', arch, featureset, flavour))
+config_image = self.config.merge('image', arch, featureset, flavour)
+
+vars.update(config_image)
+
+vars['localversion-image'] = vars['localversion']
+override_localversion = config_image.get('override-localversion', None)
+if override_localversion is not None:
+vars['localversion-image'] = vars['localversion_headers'] + '-' +
override_localversion
+
for i in (
('cflags', 'CFLAGS'),
('compiler', 'COMPILER'),
@@ -87,6 +95,7 @@
('kpkg-arch', 'KPKG_ARCH'),
('kpkg-subarch', 'KPKG_SUBARCH'),
('localversion', 'LOCALVERSION'),
+('localversion-image', 'LOCALVERSION_IMAGE'),
('override-host-type', 'OVERRIDE_HOST_TYPE'),
('type', 'TYPE'),
):
Modified: dists/sid/linux-2.6/debian/changelog
==
--- dists/sid/linux-2.6/debian/changelog(original)
+++ dists/sid/linux-2.6/debian/changelogTue Feb 26 13:43:29 2008
@@ -1,9 +1,13 @@
linux-2.6 (2.6.24-5) UNRELEASED; urgency=low
+ [ Gordon Farquharson ]
* [arm] Enable asix driver (USB_NET_AX8817X).
* [arm] Enable CONFIG_USB_CATC, CONFIG_USB_KAWETH, CONFIG_USB_PEGASUS,
and CONFIG_USB_RTL8150.
+ [ Bastian Blank ]
+ * [s390/s390-tape]: Override localversion correctly.
+
-- Gordon Farquharson [EMAIL PROTECTED] Thu, 21 Feb 2008 21:00:48 -0700
linux-2.6 (2.6.24-4) unstable; urgency=low
Modified: dists/sid/linux-2.6/debian/config/s390/defines
==
--- dists/sid/linux-2.6/debian/config/s390/defines (original)
+++ dists/sid/linux-2.6/debian/config/s390/defines Tue Feb 26 13:43:29 2008
@@ -22,6 +22,7 @@
[s390-tape_image]
desc: This kernel has support to IPL (boot) from a tape.
initramfs: false
+override-localversion: s390
type: plain-s390-tape
[s390x_base]
Modified: dists/sid/linux-2.6/debian/rules.real
==
--- dists/sid/linux-2.6/debian/rules.real (original)
+++ dists/sid/linux-2.6/debian/rules.real Tue Feb 26 13:43:29 2008
@@ -104,7 +104,7 @@
rm -rf '$(DIR)'
cp -al '$(SOURCE_DIR)' '$(DIR)'
cp '$(CONFIG)' '$(DIR)/.config'
- echo '$(ABINAME)$(LOCALVERSION)' '$(DIR)/localversion'
+ echo '$(ABINAME)$(LOCALVERSION_IMAGE)' '$(DIR)/localversion'
echo 'override ARCH = $(KERNEL_ARCH)' '$(DIR)/.kernelvariables'
echo 'CCACHE = ccache' '$(DIR)/.kernelvariables'
echo 'CC = $$(if $$(DEBIAN_KERNEL_USE_CCACHE),$$(CCACHE))
$$(CROSS_COMPILE)$(COMPILER)' '$(DIR)/.kernelvariables'
@@ -147,10 +147,12 @@
python debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
touch '$@'
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape:
BUILD_TARGET = image
+
$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain \
$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape \
$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen:
- $(MAKE_CLEAN) -C '$(DIR)' $(JOBS_ARG)
+ $(MAKE_CLEAN) -C '$(DIR)' $(JOBS_ARG) $(BUILD_TARGET)
python debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
touch '$@'
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10665 - in dists/trunk/linux-2.6/debian: . patches/bugfix patches/series
Author: tbm Date: Tue Feb 26 17:22:06 2008 New Revision: 10665 Log: fix the CRYPTO_DEV_HIFN_795X issue for good Added: dists/trunk/linux-2.6/debian/patches/bugfix/fix-hifn_795X-divdi3.patch Removed: dists/trunk/linux-2.6/debian/patches/bugfix/disable-hifn_795X.patch Modified: dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Tue Feb 26 17:22:06 2008 @@ -36,7 +36,6 @@ TS-109/TS-209. * [arm] Pad the SSB structure so crossing-compiling a kernel for ARM won't fail because of sanity checks; patch from Gordon Farquharson. - * [arm/mips] Disable CRYPTO_DEV_HIFN_795X since it doesn't compile. [ Daniel Baumann ] * Added patch from unionfs upstream to export release_open_intent symbol. Added: dists/trunk/linux-2.6/debian/patches/bugfix/fix-hifn_795X-divdi3.patch == --- (empty file) +++ dists/trunk/linux-2.6/debian/patches/bugfix/fix-hifn_795X-divdi3.patch Tue Feb 26 17:22:06 2008 @@ -0,0 +1,54 @@ +On Tue, Feb 26, 2008 at 01:21:00PM +0100, Martin Michlmayr wrote: + With 2.6.25-rc3 and a config file with + + CONFIG_CRYPTO_DEV_HIFN_795X=m + CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y + + I get the following build error on at least ARM and MIPS: + + Building modules, stage 2. + MODPOST 759 modules + ERROR: __divdi3 [drivers/crypto/hifn_795x.ko] undefined! + +Fix below. + + Martin Michlmayr + +cu +Adrian + + +-- snip -- + + +Using ndelay() with a 64bit variable as parameter can result in build +errors like the following on some 32bit systems when it results in a +64bit division: + +-- snip -- + + ... + MODPOST 759 modules +ERROR: __divdi3 [drivers/crypto/hifn_795x.ko] undefined! + +-- snip -- + +Reported by Martin Michlmayr. + +Signed-off-by: Adrian Bunk [EMAIL PROTECTED] + +--- + +40b45041ddc587c20b872a86a6a36952c28b02c7 diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c +index 3110bf7..b1541c6 100644 +--- a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c +@@ -807,7 +807,7 @@ static int hifn_rng_data_present(struct hwrng *rng, int wait) + return 1; + if (!wait) + return 0; +- ndelay(nsec); ++ ndelay((u32)nsec); + return 1; + } + Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 == --- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (original) +++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1Tue Feb 26 17:22:06 2008 @@ -31,4 +31,4 @@ + features/all/at76.patch + bugfix/arm/ignore-invalid-memtags.patch + bugfix/arm/pad-ssb-structure.patch -+ bugfix/disable-hifn_795X.patch ++ bugfix/fix-hifn_795X-divdi3.patch ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10666 - in dists/sid/linux-2.6/debian: . patches/bugfix/all/stable patches/series
Author: waldi
Date: Tue Feb 26 21:03:24 2008
New Revision: 10666
Log:
Add stable release 2.6.24.3.
* debian/changelog: Update.
* debian/patches/bugfix/all/stable/2.6.24.3.patch: Add.
* debian/patches/series/5: Add new patch.
Added:
dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.24.3.patch
dists/sid/linux-2.6/debian/patches/series/5
Modified:
dists/sid/linux-2.6/debian/changelog
Modified: dists/sid/linux-2.6/debian/changelog
==
--- dists/sid/linux-2.6/debian/changelog(original)
+++ dists/sid/linux-2.6/debian/changelogTue Feb 26 21:03:24 2008
@@ -7,6 +7,43 @@
[ Bastian Blank ]
* [s390/s390-tape]: Override localversion correctly.
+ * Add stable release 2.6.24.3:
+- x86_64: CPA, fix cache attribute inconsistency bug
+- bonding: fix NULL pointer deref in startup processing
+- POWERPC: Revert chrp_pci_fixup_vt8231_ata devinit to fix libata on
pegasos
+- PCMCIA: Fix station address detection in smc
+- SCSI: gdth: scan for scsi devices
+- USB: fix pm counter leak in usblp
+- S390: Fix futex_atomic_cmpxchg_std inline assembly.
+- genirq: do not leave interupts enabled on free_irq
+- hrtimer: catch expired CLOCK_REALTIME timers early
+- hrtimer: check relative timeouts for overflow
+- SLUB: Deal with annoying gcc warning on kfree()
+- hrtimer: fix *rmtp/restarts handling in compat_sys_nanosleep()
+- hrtimer: fix *rmtp handling in hrtimer_nanosleep()
+- Disable G5 NAP mode during SMU commands on U3
+- Be more robust about bad arguments in get_user_pages()
+- AUDIT: Increase skb-truesize in audit_expand
+- BLUETOOTH: Add conn add/del workqueues to avoid connection fail.
+- INET: Prevent out-of-sync truesize on ip_fragment slow path
+- INET_DIAG: Fix inet_diag_lock_handler error path.
+- IPCOMP: Fetch nexthdr before ipch is destroyed
+- IPCOMP: Fix reception of incompressible packets
+- IPV4: fib: fix route replacement, fib_info is shared
+- IPV4: fib_trie: apply fixes from fib_hash
+- NET: Add if_addrlabel.h to sanitized headers.
+- PKT_SCHED: ematch: oops from uninitialized variable (resend)
+- SELinux: Fix double free in selinux_netlbl_sock_setsid()
+- TC: oops in em_meta
+- TCP: Fix a bug in strategy_allowed_congestion_control
+- SCSI: sd: handle bad lba in sense information
+- Fix dl2k constants
+- XFS: Fix oops in xfs_file_readdir()
+- hugetlb: add locking for overcommit sysctl
+- inotify: fix check for one-shot watches before destroying them
+- NFS: Fix a potential file corruption issue when writing
+- NETFILTER: nf_conntrack_tcp: conntrack reopening fix
+- SPARC/SPARC64: Fix usage of .section .sched.text in assembler code.
-- Gordon Farquharson [EMAIL PROTECTED] Thu, 21 Feb 2008 21:00:48 -0700
Added: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.24.3.patch
==
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.24.3.patch Tue Feb
26 21:03:24 2008
@@ -0,0 +1,1542 @@
+diff --git a/Makefile b/Makefile
+index 6f79564..bac9dd0 100644
+diff --git a/arch/powerpc/platforms/chrp/pci.c
b/arch/powerpc/platforms/chrp/pci.c
+index 0340a34..759c2ac 100644
+--- a/arch/powerpc/platforms/chrp/pci.c
b/arch/powerpc/platforms/chrp/pci.c
+@@ -354,7 +354,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_WINBOND,
PCI_DEVICE_ID_WINBOND_82C105,
+ * mode as well. The same fixup must be done to the class-code property in
+ * the IDE node /[EMAIL PROTECTED]/[EMAIL PROTECTED],1
+ */
+-static void __devinit chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
++static void chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
+ {
+ u8 progif;
+ struct pci_dev *viaisa;
+@@ -375,4 +375,4 @@ static void __devinit chrp_pci_fixup_vt8231_ata(struct
pci_dev *viaide)
+
+ pci_dev_put(viaisa);
+ }
+-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1,
chrp_pci_fixup_vt8231_ata);
++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1,
chrp_pci_fixup_vt8231_ata);
+diff --git a/arch/powerpc/platforms/powermac/feature.c
b/arch/powerpc/platforms/powermac/feature.c
+index ba931be..5169ecc 100644
+--- a/arch/powerpc/platforms/powermac/feature.c
b/arch/powerpc/platforms/powermac/feature.c
+@@ -2565,6 +2565,8 @@ static void __init probe_uninorth(void)
+
+ /* Locate core99 Uni-N */
+ uninorth_node = of_find_node_by_name(NULL, uni-n);
++ uninorth_maj = 1;
++
+ /* Locate G5 u3 */
+ if (uninorth_node == NULL) {
+ uninorth_node = of_find_node_by_name(NULL, u3);
+@@ -2575,8 +2577,10 @@ static void __init probe_uninorth(void)
+ uninorth_node = of_find_node_by_name(NULL, u4);
+ uninorth_maj = 4;
+ }
+- if (uninorth_node == NULL)
++ if
[kernel] r10667 - in dists/trunk/linux-2.6/debian/patches: bugfix/arm series
Author: gordon-guest
Date: Wed Feb 27 06:46:24 2008
New Revision: 10667
Log:
Use patch name from -mm tree.
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/arm/fix-b43-driver-build-for-arm.patch
Removed:
dists/trunk/linux-2.6/debian/patches/bugfix/arm/pad-ssb-structure.patch
Modified:
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/arm/fix-b43-driver-build-for-arm.patch
==
--- (empty file)
+++
dists/trunk/linux-2.6/debian/patches/bugfix/arm/fix-b43-driver-build-for-arm.patch
Wed Feb 27 06:46:24 2008
@@ -0,0 +1,38 @@
+From: Gordon Farquharson [EMAIL PROTECTED]
+
+Align the members of the SSB device structure to a 32 bit boundary so that
+the b43 driver can be built for arm using a cross compiler. This alignment
+is required so that the test in scripts/mod/file2alias.c that checks that
+the size of the device ID type against the size of the section in the
+object file succeeds (see comment and http://lkml.org/lkml/2008/2/18/481
+for explanation).
+
+Signed-off-by: Gordon Farquharson [EMAIL PROTECTED]
+Cc: Russell King [EMAIL PROTECTED]
+Acked-by: Michael Buesch [EMAIL PROTECTED]
+Cc: John W. Linville [EMAIL PROTECTED]
+Signed-off-by: Andrew Morton [EMAIL PROTECTED]
+---
+
+ include/linux/mod_devicetable.h |8 +++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff -puN include/linux/mod_devicetable.h~fix-b43-driver-build-for-arm
include/linux/mod_devicetable.h
+--- a/include/linux/mod_devicetable.h~fix-b43-driver-build-for-arm
a/include/linux/mod_devicetable.h
+@@ -351,7 +351,13 @@ struct sdio_device_id {
+ struct ssb_device_id {
+ __u16 vendor;
+ __u16 coreid;
+- __u8revision;
++ /* Explicit padding to support a broken sanity check in file2alias.c.
++ * The check compares the size of the structure in the kernel
++ * object file to the size of the structure reported in userspace for
++ * the system on which the kernel is compiled. The check breaks on
++ * cross-compilation, and the padding is a workaround for this. */
++ __u8revision
++ __attribute__((aligned(sizeof(__u32;
+ };
+ #define SSB_DEVICE(_vendor, _coreid, _revision) \
+ { .vendor = _vendor, .coreid = _coreid, .revision = _revision, }
+_
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1Wed Feb
27 06:46:24 2008
@@ -30,5 +30,5 @@
+ bugfix/arm/disable-r6040.patch
+ features/all/at76.patch
+ bugfix/arm/ignore-invalid-memtags.patch
-+ bugfix/arm/pad-ssb-structure.patch
++ bugfix/arm/fix-b43-driver-build-for-arm.patch
+ bugfix/fix-hifn_795X-divdi3.patch
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10668 - in dists/trunk/linux-2.6/debian: . config/arm patches/features/all patches/series
Author: gordon-guest
Date: Wed Feb 27 07:03:03 2008
New Revision: 10668
Log:
* [arm/iop32x] Enable support for the GLAN Tank flash chip (M29W400DB).
* Fix changelog.
Added:
dists/trunk/linux-2.6/debian/patches/features/all/add-m29w400db.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/arm/config.iop32x
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Wed Feb 27 07:03:03 2008
@@ -1,4 +1,4 @@
-iinux-2.6 (2.6.25~rc3-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.25~rc3-1~experimental.1) UNRELEASED; urgency=low
* New upstream release (closes: #456799)
@@ -42,6 +42,8 @@
[ Gordon Farquharson ]
* [arm] Use GPIO LED driver as opposed to ixp4xx LED driver.
+ * [arm/iop32x] Enable support for the GLAN Tank flash chip
+(M29W400DB).
[ Aurelien Jarno ]
* [mips/mipsel] Enable CONFIG_NO_HZ, CONFIG_HIGH_RES_TIMERS for dynticks
@@ -54,7 +56,7 @@
- Broadcom NetXtremeII 10Gb support
* [powerpc] Use new wrapper install support.
- -- Gordon Farquharson [EMAIL PROTECTED] Thu, 14 Feb 2008 00:25:23 -0700
+ -- Bastian Blank [EMAIL PROTECTED] Tue, 26 Feb 2008 23:59:55 -0700
linux-2.6 (2.6.24-2) UNRELEASED; urgency=low
Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x
==
--- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Wed Feb 27
07:03:03 2008
@@ -342,7 +342,7 @@
# RAM/ROM/Flash chip drivers
#
CONFIG_MTD_CFI=y
-# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_JEDECPROBE=y
CONFIG_MTD_GEN_PROBE=y
CONFIG_MTD_CFI_ADV_OPTIONS=y
CONFIG_MTD_CFI_NOSWAP=y
@@ -361,7 +361,7 @@
# CONFIG_MTD_CFI_I8 is not set
# CONFIG_MTD_OTP is not set
CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_AMDSTD is not set
+CONFIG_MTD_CFI_AMDSTD=y
# CONFIG_MTD_CFI_STAA is not set
CONFIG_MTD_CFI_UTIL=y
CONFIG_MTD_RAM=m
Added: dists/trunk/linux-2.6/debian/patches/features/all/add-m29w400db.patch
==
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/features/all/add-m29w400db.patch
Wed Feb 27 07:03:03 2008
@@ -0,0 +1,36 @@
+diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
+index 4be51a8..51ec937 100644
+--- a/drivers/mtd/chips/jedec_probe.c
b/drivers/mtd/chips/jedec_probe.c
+@@ -135,6 +135,7 @@
+ #define M29W160DT 0x22C4
+ #define M29W160DB 0x2249
+ #define M29W040B 0x00E3
++#define M29W400DB 0x00EF
+ #define M50FW040 0x002C
+ #define M50FW080 0x002D
+ #define M50FW016 0x002E
+@@ -1498,7 +1499,22 @@ static const struct amd_flash_info jedec_table[] = {
+ .regions= {
+ ERASEINFO(0x1,8),
+ }
+-}, {
++ }, {
++ .mfr_id = MANUFACTURER_ST,
++ .dev_id = M29W400DB,
++ .name = ST M29W400DB,
++ .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
++ .uaddr = MTD_UADDR_0x0555_0x02AA,
++ .dev_size = SIZE_512KiB,
++ .cmd_set= P_ID_AMD_STD,
++ .nr_regions = 4,
++ .regions= {
++ ERASEINFO(0x04000,1),
++ ERASEINFO(0x02000,2),
++ ERASEINFO(0x08000,1),
++ ERASEINFO(0x1,7)
++ }
++ }, {
+ .mfr_id = MANUFACTURER_ST,
+ .dev_id = M50FW040,
+ .name = ST M50FW040,
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1Wed Feb
27 07:03:03 2008
@@ -32,3 +32,4 @@
+ bugfix/arm/ignore-invalid-memtags.patch
+ bugfix/arm/fix-b43-driver-build-for-arm.patch
+ bugfix/fix-hifn_795X-divdi3.patch
++ features/all/add-m29w400db.patch
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
