diff options
| author | Ben Hutchings <benh@debian.org> | 2014-03-17 13:29:57 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2014-03-17 13:29:57 +0000 |
| commit | 819efd7e33ee1a3ee587442586dd739f28cdf13d (patch) | |
| tree | e2f46244bf02ceec00fefabdda76602cc4b44bd2 | |
| parent | 06654b3b80516ecc5003048400cdf3ff59d7fe35 (diff) | |
| download | kernel_replicant_linux-debian/3.14_rc7-1_exp1.tar.gz kernel_replicant_linux-debian/3.14_rc7-1_exp1.tar.bz2 kernel_replicant_linux-debian/3.14_rc7-1_exp1.zip | |
Update to 3.14-rc7debian/3.14_rc7-1_exp1
svn path=/dists/trunk/linux/; revision=21156
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/bugfix/arm/bna-Replace-large-udelay-with-mdelay.patch | 30 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 32 deletions
diff --git a/debian/changelog b/debian/changelog index efb6d60bb01a..dca185bb099e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux (3.14~rc6-1~exp1) UNRELEASED; urgency=medium +linux (3.14~rc7-1~exp1) UNRELEASED; urgency=medium * New upstream release candidate diff --git a/debian/patches/bugfix/arm/bna-Replace-large-udelay-with-mdelay.patch b/debian/patches/bugfix/arm/bna-Replace-large-udelay-with-mdelay.patch deleted file mode 100644 index 2a8da1380262..000000000000 --- a/debian/patches/bugfix/arm/bna-Replace-large-udelay-with-mdelay.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Ben Hutchings <ben@decadent.org.uk> -Date: Sun, 9 Mar 2014 03:58:52 +0000 -Subject: bna: Replace large udelay() with mdelay() -Bug-Debian: https://bugs.debian.org/741142 -Forwarded: http://mid.gmane.org/1394337802.2861.71.camel@deadeye.wl.decadent.org.uk - -udelay() does not work on some architectures for values above -2000, in particular on ARM: - -ERROR: "__bad_udelay" [drivers/net/ethernet/brocade/bna/bna.ko] undefined! - -Reported-by: Vagrant Cascadian <vagrant@debian.org> -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> ---- - drivers/net/ethernet/brocade/bna/bfa_ioc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c -index 1803c39..354ae97 100644 ---- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c -+++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c -@@ -1704,7 +1704,7 @@ bfa_flash_sem_get(void __iomem *bar) - while (!bfa_raw_sem_get(bar)) { - if (--n <= 0) - return BFA_STATUS_BADFLASH; -- udelay(10000); -+ mdelay(10); - } - return BFA_STATUS_OK; - } diff --git a/debian/patches/series b/debian/patches/series index 9fe9002d9095..16602abd2f15 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -70,5 +70,4 @@ bugfix/all/bluetooth-allocate-static-minor-for-vhci.patch features/all/x86-memtest-WARN-if-bad-RAM-found.patch features/all/efi-autoload-efivars.patch features/all/mvsas-Recognise-device-subsystem-9485-9485-as-88SE94.patch -bugfix/arm/bna-Replace-large-udelay-with-mdelay.patch bugfix/arm/bfa-Replace-large-udelay-with-mdelay.patch |