[arch-commits] Commit in linux/trunk (3 files)

[Tobias Powalowski]

    Date: Wednesday, August 15, 2012 @ 14:27:18
  Author: tpowa
Revision: 165327

upgpkg: linux 3.5.2-1

bump to latest version

Modified:
  linux/trunk/PKGBUILD
  linux/trunk/linux.install
Deleted:
  linux/trunk/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch

--------------------------------------------------------+
 PKGBUILD                                               |   15 +---
 avmfritz-only-few-bytes-are-transfered-on-a-conn.patch |   48 ---------------
 linux.install                                          |    2 
 3 files changed, 5 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-15 15:47:04 UTC (rev 165326)
+++ PKGBUILD	2012-08-15 18:27:18 UTC (rev 165327)
@@ -5,7 +5,7 @@
 pkgbase=linux               # Build stock -ARCH kernel
 #pkgbase=linux-custom       # Build kernel with a different name
 _srcname=linux-3.5
-pkgver=3.5.1
+pkgver=3.5.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
@@ -18,17 +18,15 @@
         'config' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
-        'change-default-console-loglevel.patch'
-        'avmfritz-only-few-bytes-are-transfered-on-a-conn.patch')
+        'change-default-console-loglevel.patch')
 
 _kernelname=${pkgbase#linux}
 md5sums=('24153eaaa81dedc9481ada8cd9c3b83d'
-         '35add5b2e64d1cbc8d123980c967e7ca'
+         '8e9f9cfd5fbd33ac4b265a4d47949edc'
          '31dade2f50803beaebf947732f39b51e'
          '34bf41248c2ab68ddb0a7b3b5f4a68ce'
          'eb14dcfd80c00852ef81ded6e826826a'
-         '9d3c56a4b999c8bfbd4018089a62f662'
-         '2afcc001cc178be72e3a19d95f4bd5eb')
+         '9d3c56a4b999c8bfbd4018089a62f662')
 
 build() {
   cd "${srcdir}/${_srcname}"
@@ -44,11 +42,6 @@
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # fix avmfritz capi20 functionallity
-  # will be added to 3.5.2
-  # https://bugzilla.kernel.org/show_bug.cgi?id=45271
-  patch -Np1 -i "${srcdir}/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch"
-
   if [ "${CARCH}" = "x86_64" ]; then
     cat "${srcdir}/config.x86_64" > ./.config
   else

Deleted: avmfritz-only-few-bytes-are-transfered-on-a-conn.patch
===================================================================
--- avmfritz-only-few-bytes-are-transfered-on-a-conn.patch	2012-08-15 15:47:04 UTC (rev 165326)
+++ avmfritz-only-few-bytes-are-transfered-on-a-conn.patch	2012-08-15 18:27:18 UTC (rev 165327)
@@ -1,48 +0,0 @@
-From 285c08154eede7dc4387bfc925967c884594dcc9 Mon Sep 17 00:00:00 2001
-From: Karsten Keil <keil at b1-systems.de>
-Date: Sat, 28 Jul 2012 20:10:04 +0200
-Subject: [PATCH] mISDN: Bugfix only few bytes are transfered on a connection
-
-The test for the fillempty condition was wrong in one place.
-Changed the variable to the right boolean type.
-
-Signed-off-by: Karsten Keil <keil at b1-systems.de>
----
- drivers/isdn/hardware/mISDN/avmfritz.c |    7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
-index c08fc60..fa6ca47 100644
---- a/drivers/isdn/hardware/mISDN/avmfritz.c
-+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
-@@ -449,7 +449,8 @@ hdlc_fill_fifo(struct bchannel *bch)
- {
- 	struct fritzcard *fc = bch->hw;
- 	struct hdlc_hw *hdlc;
--	int count, fs, cnt = 0, idx, fillempty = 0;
-+	int count, fs, cnt = 0, idx;
-+	bool fillempty = false;
- 	u8 *p;
- 	u32 *ptr, val, addr;
- 
-@@ -462,7 +463,7 @@ hdlc_fill_fifo(struct bchannel *bch)
- 			return;
- 		count = fs;
- 		p = bch->fill;
--		fillempty = 1;
-+		fillempty = true;
- 	} else {
- 		count = bch->tx_skb->len - bch->tx_idx;
- 		if (count <= 0)
-@@ -477,7 +478,7 @@ hdlc_fill_fifo(struct bchannel *bch)
- 			hdlc->ctrl.sr.cmd |= HDLC_CMD_XME;
- 	}
- 	ptr = (u32 *)p;
--	if (fillempty) {
-+	if (!fillempty) {
- 		pr_debug("%s.B%d: %d/%d/%d", fc->name, bch->nr, count,
- 			 bch->tx_idx, bch->tx_skb->len);
- 		bch->tx_idx += count;
--- 
-1.7.7
-

Modified: linux.install
===================================================================
--- linux.install	2012-08-15 15:47:04 UTC (rev 165326)
+++ linux.install	2012-08-15 18:27:18 UTC (rev 165327)
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.5.1-1-ARCH
+KERNEL_VERSION=3.5.2-1-ARCH
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'