From c94be70e015e00727bbb3ea47a067c34211f2e0c Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 22 Nov 2011 05:37:48 +0000 Subject: [PATCH 01/13] Update to 3.1.2 svn path=/dists/sid/linux-2.6/; revision=18300 --- debian/changelog | 7 ++++ ...ck-length-of-all-iov-entries-in-blk_.patch | 34 ------------------- debian/patches/series/base | 1 - 3 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 debian/patches/bugfix/all/block-Always-check-length-of-all-iov-entries-in-blk_.patch diff --git a/debian/changelog b/debian/changelog index 1db490886..04d323f61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux-2.6 (3.1.2-1) UNRELEASED; urgency=low + + * New upstream stable update: + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.2 + + -- Ben Hutchings Tue, 22 Nov 2011 05:26:25 +0000 + linux-2.6 (3.1.1-1) unstable; urgency=high * New upstream stable update: diff --git a/debian/patches/bugfix/all/block-Always-check-length-of-all-iov-entries-in-blk_.patch b/debian/patches/bugfix/all/block-Always-check-length-of-all-iov-entries-in-blk_.patch deleted file mode 100644 index a93166e4a..000000000 --- a/debian/patches/bugfix/all/block-Always-check-length-of-all-iov-entries-in-blk_.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Ben Hutchings -Date: Sun, 13 Nov 2011 18:42:46 +0000 -Subject: [PATCH] block: Always check length of all iov entries in - blk_rq_map_user_iov() - -Even after commit 5478755616ae2ef1ce144dded589b62b2a50d575 -("block: check for proper length of iov entries earlier ...") -we still won't check for zero-length entries after an unaligned -entry. Remove the break-statement, so all entries are checked. - -Signed-off-by: Ben Hutchings ---- - block/blk-map.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -diff --git a/block/blk-map.c b/block/blk-map.c -index e663ac2..2e852a4 100644 ---- a/block/blk-map.c -+++ b/block/blk-map.c -@@ -204,10 +204,8 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq, - if (!iov[i].iov_len) - return -EINVAL; - -- if (uaddr & queue_dma_alignment(q)) { -+ if (uaddr & queue_dma_alignment(q)) - unaligned = 1; -- break; -- } - } - - if (unaligned || (q->dma_pad_mask & len) || map_data) --- -1.7.7.2 - diff --git a/debian/patches/series/base b/debian/patches/series/base index a9db79d6c..88213be44 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -57,7 +57,6 @@ + bugfix/all/PM-Freezer-Reimplement-wait_event_freezekillable-usi.patch + bugfix/all/hfs-fix-hfs_find_init-sb-ext_tree-NULL-ptr-oops.patch + bugfix/all/vmscan-fix-shrinker-callback-bug-in-fs-super.c.patch -+ bugfix/all/block-Always-check-length-of-all-iov-entries-in-blk_.patch + features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch # Defer until we're sure about the system call number From ce522b033c1cb6cd18261bdf8c9423197f555419 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Tue, 22 Nov 2011 15:26:19 +0000 Subject: [PATCH 02/13] Set the priority of pata-modules to standard since the GLAN Tank uses PATA. svn path=/dists/sid/linux-2.6/; revision=18311 --- debian/changelog | 4 ++++ debian/installer/armel/package-list | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 04d323f61..0f7cae609 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ linux-2.6 (3.1.2-1) UNRELEASED; urgency=low * New upstream stable update: http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.2 + [ Martin Michlmayr ] + * [armel] Set the priority of pata-modules to standard since the + GLAN Tank uses PATA. + -- Ben Hutchings Tue, 22 Nov 2011 05:26:25 +0000 linux-2.6 (3.1.1-1) unstable; urgency=high diff --git a/debian/installer/armel/package-list b/debian/installer/armel/package-list index 2e6bb4e03..a4aaeed10 100644 --- a/debian/installer/armel/package-list +++ b/debian/installer/armel/package-list @@ -26,7 +26,7 @@ Depends: usb-modules, nls-core-modules Package: pata-modules Depends: kernel-image, ata-modules -Priority: extra +Priority: standard Package: nbd-modules Depends: kernel-image From e714f93eb827c6dbec2d09c2d3fd5cb676ee4cb2 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 24 Nov 2011 07:59:05 +0000 Subject: [PATCH 03/13] Enable BCMA as module, BCMA_HOST_PCI and B43_BCMA (Closes: #649567) But limit these to devices not supported by brcmsmac. svn path=/dists/sid/linux-2.6/; revision=18314 --- debian/changelog | 4 +++ debian/config/config | 6 +++- ...m-PCI-device-IDs-also-claimed-by-brc.patch | 31 +++++++++++++++++++ debian/patches/series/base | 1 + 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch diff --git a/debian/changelog b/debian/changelog index 0f7cae609..dc78f38cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,10 @@ linux-2.6 (3.1.2-1) UNRELEASED; urgency=low * [armel] Set the priority of pata-modules to standard since the GLAN Tank uses PATA. + [ Ben Hutchings ] + * Enable BCMA as module, BCMA_HOST_PCI and B43_BCMA (Closes: #649567) + but limit these to devices not supported by brcmsmac + -- Ben Hutchings Tue, 22 Nov 2011 05:26:25 +0000 linux-2.6 (3.1.1-1) unstable; urgency=high diff --git a/debian/config/config b/debian/config/config index c6f90d06f..8567108f7 100644 --- a/debian/config/config +++ b/debian/config/config @@ -197,7 +197,10 @@ CONFIG_EXTRA_FIRMWARE="" ## ## file: drivers/bcma/Kconfig ## -# CONFIG_BCMA is not set +CONFIG_BCMA=m +CONFIG_BCMA_HOST_PCI=y +# CONFIG_BCMA_DRIVER_PCI_HOSTMODE is not set +# CONFIG_BCMA_DEBUG is not set ## ## file: drivers/block/Kconfig @@ -2000,6 +2003,7 @@ CONFIG_CARL9170_LEDS=y ## file: drivers/net/wireless/b43/Kconfig ## CONFIG_B43=m +CONFIG_B43_BCMA=y CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y CONFIG_B43_PHY_N=y diff --git a/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch b/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch new file mode 100644 index 000000000..b74f5fcc7 --- /dev/null +++ b/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch @@ -0,0 +1,31 @@ +From: Ben Hutchings +Date: Thu, 24 Nov 2011 07:45:52 +0000 +Subject: [PATCH] bcma: Do not claim PCI device IDs also claimed by brcmsmac + +Signed-off-by: Ben Hutchings +--- + drivers/bcma/host_pci.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c +index ac4bc62..e75e78d 100644 +--- a/drivers/bcma/host_pci.c ++++ b/drivers/bcma/host_pci.c +@@ -224,11 +224,13 @@ static void bcma_host_pci_remove(struct pci_dev *dev) + } + + static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = { ++#if !IS_ENABLED(CONFIG_BRCMSMAC) + { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) }, +- { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) }, + { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) }, + { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) }, + { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) }, ++#endif ++ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) }, + { 0, }, + }; + MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl); +-- +1.7.7.3 + diff --git a/debian/patches/series/base b/debian/patches/series/base index 88213be44..006059475 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -72,3 +72,4 @@ + features/arm/imx53_ahci4.patch + features/arm/imx53_ahci5.patch ++ debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch From 33ddc4f886eff08b60304b05663af9a6b2cc3252 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 24 Nov 2011 08:01:02 +0000 Subject: [PATCH 04/13] brcmsmac: Enable as module for all architectures svn path=/dists/sid/linux-2.6/; revision=18315 --- debian/changelog | 1 + debian/config/config | 7 +++++++ debian/config/kernelarch-x86/config | 7 ------- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc78f38cb..47538d4bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ linux-2.6 (3.1.2-1) UNRELEASED; urgency=low [ Ben Hutchings ] * Enable BCMA as module, BCMA_HOST_PCI and B43_BCMA (Closes: #649567) but limit these to devices not supported by brcmsmac + * brcmsmac: Enable as module for all architectures -- Ben Hutchings Tue, 22 Nov 2011 05:26:25 +0000 diff --git a/debian/config/config b/debian/config/config index 8567108f7..1bc1d2df1 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2550,6 +2550,13 @@ CONFIG_STAGING=y ## # CONFIG_ASUS_OLED is not set +## +## file: drivers/staging/brcm80211/Kconfig +## +CONFIG_BRCMSMAC=m +# CONFIG_BRCMFMAC is not set +# CONFIG_BRCMDBG is not set + ## ## file: drivers/staging/comedi/Kconfig ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 8101e4c04..7f48e157a 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1081,13 +1081,6 @@ CONFIG_PCMCIA_SYM53C500=m ## CONFIG_SFI=y -## -## file: drivers/staging/brcm80211/Kconfig -## -CONFIG_BRCMSMAC=m -# CONFIG_BRCMFMAC is not set -# CONFIG_BRCMDBG is not set - ## ## file: drivers/staging/comedi/Kconfig ## From b476ae2bc636d6baf8ffeea83e592ee91e2194af Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 24 Nov 2011 08:33:38 +0000 Subject: [PATCH 05/13] Include module taint flags in bug reports svn path=/dists/sid/linux-2.6/; revision=18316 --- debian/changelog | 1 + debian/templates/image.plain.bug/include-modules | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 47538d4bb..8a24b373c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ linux-2.6 (3.1.2-1) UNRELEASED; urgency=low * Enable BCMA as module, BCMA_HOST_PCI and B43_BCMA (Closes: #649567) but limit these to devices not supported by brcmsmac * brcmsmac: Enable as module for all architectures + * Include module taint flags in bug reports -- Ben Hutchings Tue, 22 Nov 2011 05:26:25 +0000 diff --git a/debian/templates/image.plain.bug/include-modules b/debian/templates/image.plain.bug/include-modules index 6d2496d90..676810c0e 100644 --- a/debian/templates/image.plain.bug/include-modules +++ b/debian/templates/image.plain.bug/include-modules @@ -1,6 +1,7 @@ add_modules() { echo '** Loaded modules:' >&3 - lsmod >&3 + # List modules along with any taint flags + cut -d' ' --output-delimiter='' -f1,7 /proc/modules >&3 echo >&3 } From 1a7fd6fae1b8d0e91ef8f7448f67af3e0be363e6 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 25 Nov 2011 00:46:02 +0000 Subject: [PATCH 06/13] lirc_serial: Fix various bugs that may result in a crash, deadlock or other failure (Closes: #645811) svn path=/dists/sid/linux-2.6/; revision=18317 --- debian/changelog | 2 + ...ging-lirc_serial-Fix-init-exit-order.patch | 141 ++++++++++++++++++ ...rc_serial-Free-resources-on-failure-.patch | 60 ++++++++ ...rc_serial-Fix-deadlock-on-resume-fai.patch | 35 +++++ ...ng-lirc_serial-Fix-bogus-error-codes.patch | 103 +++++++++++++ ...rc_serial-Do-not-assume-error-codes-.patch | 52 +++++++ debian/patches/series/base | 6 + 7 files changed, 399 insertions(+) create mode 100644 debian/patches/bugfix/all/0001-media-staging-lirc_serial-Fix-init-exit-order.patch create mode 100644 debian/patches/bugfix/all/0002-media-staging-lirc_serial-Free-resources-on-failure-.patch create mode 100644 debian/patches/bugfix/all/0003-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch create mode 100644 debian/patches/bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch create mode 100644 debian/patches/bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch diff --git a/debian/changelog b/debian/changelog index 8a24b373c..4528f2511 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ linux-2.6 (3.1.2-1) UNRELEASED; urgency=low but limit these to devices not supported by brcmsmac * brcmsmac: Enable as module for all architectures * Include module taint flags in bug reports + * lirc_serial: Fix various bugs that may result in a crash, deadlock or + other failure (Closes: #645811) -- Ben Hutchings Tue, 22 Nov 2011 05:26:25 +0000 diff --git a/debian/patches/bugfix/all/0001-media-staging-lirc_serial-Fix-init-exit-order.patch b/debian/patches/bugfix/all/0001-media-staging-lirc_serial-Fix-init-exit-order.patch new file mode 100644 index 000000000..65e09832a --- /dev/null +++ b/debian/patches/bugfix/all/0001-media-staging-lirc_serial-Fix-init-exit-order.patch @@ -0,0 +1,141 @@ +From: Ben Hutchings +Date: Wed, 16 Nov 2011 01:49:41 -0300 +Subject: [PATCH 1/5] [media] staging: lirc_serial: Fix init/exit order + +commit 9105b8b200410383d0854bbe237ee385d7d33ba6 upstream. + +Currently the module init function registers a platform_device and +only then allocates its IRQ and I/O region. This allows allocation to +race with the device's suspend() function. Instead, allocate +resources in the platform driver's probe() function and free them in +the remove() function. + +The module exit function removes the platform device before the +character device that provides access to it. Change it to reverse the +order of initialisation. + +Signed-off-by: Ben Hutchings +Signed-off-by: Mauro Carvalho Chehab +[bwh: Adjust filename for 3.1] +--- + drivers/staging/lirc/lirc_serial.c | 56 +++++++++++------------------ + 1 files changed, 21 insertions(+), 35 deletions(-) + +diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c +index 8a060a8..8637631 100644 +--- a/drivers/staging/lirc/lirc_serial.c ++++ b/drivers/staging/lirc/lirc_serial.c +@@ -836,7 +836,7 @@ static int hardware_init_port(void) + return 0; + } + +-static int init_port(void) ++static int __devinit lirc_serial_probe(struct platform_device *dev) + { + int i, nlow, nhigh, result; + +@@ -913,6 +913,18 @@ static int init_port(void) + return 0; + } + ++static int __devexit lirc_serial_remove(struct platform_device *dev) ++{ ++ free_irq(irq, (void *)&hardware); ++ ++ if (iommap != 0) ++ release_mem_region(iommap, 8 << ioshift); ++ else ++ release_region(io, 8); ++ ++ return 0; ++} ++ + static int set_use_inc(void *data) + { + unsigned long flags; +@@ -1076,16 +1088,6 @@ static struct lirc_driver driver = { + + static struct platform_device *lirc_serial_dev; + +-static int __devinit lirc_serial_probe(struct platform_device *dev) +-{ +- return 0; +-} +- +-static int __devexit lirc_serial_remove(struct platform_device *dev) +-{ +- return 0; +-} +- + static int lirc_serial_suspend(struct platform_device *dev, + pm_message_t state) + { +@@ -1188,10 +1190,6 @@ static int __init lirc_serial_init_module(void) + { + int result; + +- result = lirc_serial_init(); +- if (result) +- return result; +- + switch (type) { + case LIRC_HOMEBREW: + case LIRC_IRDEO: +@@ -1211,8 +1209,7 @@ static int __init lirc_serial_init_module(void) + break; + #endif + default: +- result = -EINVAL; +- goto exit_serial_exit; ++ return -EINVAL; + } + if (!softcarrier) { + switch (type) { +@@ -1228,37 +1225,26 @@ static int __init lirc_serial_init_module(void) + } + } + +- result = init_port(); +- if (result < 0) +- goto exit_serial_exit; ++ result = lirc_serial_init(); ++ if (result) ++ return result; ++ + driver.features = hardware[type].features; + driver.dev = &lirc_serial_dev->dev; + driver.minor = lirc_register_driver(&driver); + if (driver.minor < 0) { + printk(KERN_ERR LIRC_DRIVER_NAME + ": register_chrdev failed!\n"); +- result = -EIO; +- goto exit_release; ++ lirc_serial_exit(); ++ return -EIO; + } + return 0; +-exit_release: +- release_region(io, 8); +-exit_serial_exit: +- lirc_serial_exit(); +- return result; + } + + static void __exit lirc_serial_exit_module(void) + { +- lirc_serial_exit(); +- +- free_irq(irq, (void *)&hardware); +- +- if (iommap != 0) +- release_mem_region(iommap, 8 << ioshift); +- else +- release_region(io, 8); + lirc_unregister_driver(driver.minor); ++ lirc_serial_exit(); + dprintk("cleaned up module\n"); + } + +-- +1.7.7.3 + diff --git a/debian/patches/bugfix/all/0002-media-staging-lirc_serial-Free-resources-on-failure-.patch b/debian/patches/bugfix/all/0002-media-staging-lirc_serial-Free-resources-on-failure-.patch new file mode 100644 index 000000000..cc64ef7e2 --- /dev/null +++ b/debian/patches/bugfix/all/0002-media-staging-lirc_serial-Free-resources-on-failure-.patch @@ -0,0 +1,60 @@ +From: Ben Hutchings +Date: Wed, 16 Nov 2011 01:52:11 -0300 +Subject: [PATCH 2/5] [media] staging: lirc_serial: Free resources on failure + paths of lirc_serial_probe() + +commit c8e57e1b766c2321aa76ee5e6878c69bd2313d62 upstream. + +Failure to allocate the I/O region leaves the IRQ allocated. +A later failure leaves them both allocated. + +Reported-by: Torsten Crass +Signed-off-by: Ben Hutchings +Signed-off-by: Mauro Carvalho Chehab +[bwh: Adjust filename for 3.1] +--- + drivers/staging/lirc/lirc_serial.c | 19 ++++++++++++++++--- + 1 files changed, 16 insertions(+), 3 deletions(-) + +diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c +index 8637631..d833772 100644 +--- a/drivers/staging/lirc/lirc_serial.c ++++ b/drivers/staging/lirc/lirc_serial.c +@@ -875,11 +875,14 @@ static int __devinit lirc_serial_probe(struct platform_device *dev) + ": or compile the serial port driver as module and\n"); + printk(KERN_WARNING LIRC_DRIVER_NAME + ": make sure this module is loaded first\n"); +- return -EBUSY; ++ result = -EBUSY; ++ goto exit_free_irq; + } + +- if (hardware_init_port() < 0) +- return -EINVAL; ++ if (hardware_init_port() < 0) { ++ result = -EINVAL; ++ goto exit_release_region; ++ } + + /* Initialize pulse/space widths */ + init_timing_params(duty_cycle, freq); +@@ -911,6 +914,16 @@ static int __devinit lirc_serial_probe(struct platform_device *dev) + + dprintk("Interrupt %d, port %04x obtained\n", irq, io); + return 0; ++ ++exit_release_region: ++ if (iommap != 0) ++ release_mem_region(iommap, 8 << ioshift); ++ else ++ release_region(io, 8); ++exit_free_irq: ++ free_irq(irq, (void *)&hardware); ++ ++ return result; + } + + static int __devexit lirc_serial_remove(struct platform_device *dev) +-- +1.7.7.3 + diff --git a/debian/patches/bugfix/all/0003-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch b/debian/patches/bugfix/all/0003-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch new file mode 100644 index 000000000..dd94e88a7 --- /dev/null +++ b/debian/patches/bugfix/all/0003-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch @@ -0,0 +1,35 @@ +From: Ben Hutchings +Date: Wed, 16 Nov 2011 01:53:25 -0300 +Subject: [PATCH 3/5] [media] staging: lirc_serial: Fix deadlock on resume + failure + +commit 1ff1d88e862948ae5bfe490248c023ff8ac2855d upstream. + +A resume function cannot remove the device it is resuming! + +Signed-off-by: Ben Hutchings +Signed-off-by: Mauro Carvalho Chehab +[bwh: Adjust filename for 3.1] +--- + drivers/staging/lirc/lirc_serial.c | 4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) + +diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c +index d833772..befe626 100644 +--- a/drivers/staging/lirc/lirc_serial.c ++++ b/drivers/staging/lirc/lirc_serial.c +@@ -1127,10 +1127,8 @@ static int lirc_serial_resume(struct platform_device *dev) + { + unsigned long flags; + +- if (hardware_init_port() < 0) { +- lirc_serial_exit(); ++ if (hardware_init_port() < 0) + return -EINVAL; +- } + + spin_lock_irqsave(&hardware[type].lock, flags); + /* Enable Interrupt */ +-- +1.7.7.3 + diff --git a/debian/patches/bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch b/debian/patches/bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch new file mode 100644 index 000000000..bcd771564 --- /dev/null +++ b/debian/patches/bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch @@ -0,0 +1,103 @@ +From: Ben Hutchings +Date: Wed, 16 Nov 2011 01:53:35 -0300 +Subject: [PATCH 4/5] [media] staging: lirc_serial: Fix bogus error codes + +commit 9b98d60679711753e548be15c6bef5239db6ed64 upstream. + +Device not found? ENODEV, not EINVAL. +Write to read-only device? EPERM, not EBADF. +Invalid argument? EINVAL, not ENOSYS. +Unsupported ioctl? ENOIOCTLCMD, not ENOSYS. +Another function returned an error code? Use that, don't replace it. + +Signed-off-by: Ben Hutchings +Signed-off-by: Mauro Carvalho Chehab +[bwh: Adjust filename for 3.1] +--- + drivers/staging/lirc/lirc_serial.c | 23 ++++++++++++----------- + 1 files changed, 12 insertions(+), 11 deletions(-) + +diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c +index befe626..6f5257e 100644 +--- a/drivers/staging/lirc/lirc_serial.c ++++ b/drivers/staging/lirc/lirc_serial.c +@@ -773,7 +773,7 @@ static int hardware_init_port(void) + /* we fail, there's nothing here */ + printk(KERN_ERR LIRC_DRIVER_NAME ": port existence test " + "failed, cannot continue\n"); +- return -EINVAL; ++ return -ENODEV; + } + + +@@ -879,10 +879,9 @@ static int __devinit lirc_serial_probe(struct platform_device *dev) + goto exit_free_irq; + } + +- if (hardware_init_port() < 0) { +- result = -EINVAL; ++ result = hardware_init_port(); ++ if (result < 0) + goto exit_release_region; +- } + + /* Initialize pulse/space widths */ + init_timing_params(duty_cycle, freq); +@@ -980,7 +979,7 @@ static ssize_t lirc_write(struct file *file, const char *buf, + int *wbuf; + + if (!(hardware[type].features & LIRC_CAN_SEND_PULSE)) +- return -EBADF; ++ return -EPERM; + + count = n / sizeof(int); + if (n % sizeof(int) || count % 2 == 0) +@@ -1031,11 +1030,11 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) + return result; + /* only LIRC_MODE_PULSE supported */ + if (value != LIRC_MODE_PULSE) +- return -ENOSYS; ++ return -EINVAL; + break; + + case LIRC_GET_LENGTH: +- return -ENOSYS; ++ return -ENOIOCTLCMD; + break; + + case LIRC_SET_SEND_DUTY_CYCLE: +@@ -1126,9 +1125,11 @@ static void lirc_serial_exit(void); + static int lirc_serial_resume(struct platform_device *dev) + { + unsigned long flags; ++ int result; + +- if (hardware_init_port() < 0) +- return -EINVAL; ++ result = hardware_init_port(); ++ if (result < 0) ++ return result; + + spin_lock_irqsave(&hardware[type].lock, flags); + /* Enable Interrupt */ +@@ -1161,7 +1162,7 @@ static int __init lirc_serial_init(void) + /* Init read buffer. */ + result = lirc_buffer_init(&rbuf, sizeof(int), RBUF_LEN); + if (result < 0) +- return -ENOMEM; ++ return result; + + result = platform_driver_register(&lirc_serial_driver); + if (result) { +@@ -1247,7 +1248,7 @@ static int __init lirc_serial_init_module(void) + printk(KERN_ERR LIRC_DRIVER_NAME + ": register_chrdev failed!\n"); + lirc_serial_exit(); +- return -EIO; ++ return driver.minor; + } + return 0; + } +-- +1.7.7.3 + diff --git a/debian/patches/bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch b/debian/patches/bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch new file mode 100644 index 000000000..0fe57a510 --- /dev/null +++ b/debian/patches/bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch @@ -0,0 +1,52 @@ +From: Ben Hutchings +Date: Wed, 16 Nov 2011 01:54:04 -0300 +Subject: [PATCH 5/5] [media] staging: lirc_serial: Do not assume error codes + returned by request_irq() + +commit affc9a0d59ac49bd304e2137bd5e4ffdd6fdfa52 upstream. + +lirc_serial_probe() must fail if request_irq() returns an error, even if +it isn't EBUSY or EINVAL, + +Signed-off-by: Ben Hutchings +Signed-off-by: Mauro Carvalho Chehab +[bwh: Adjust filename for 3.1] +--- + drivers/staging/lirc/lirc_serial.c | 21 +++++++++------------ + 1 files changed, 9 insertions(+), 12 deletions(-) + +diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c +index 6f5257e..0ca308a 100644 +--- a/drivers/staging/lirc/lirc_serial.c ++++ b/drivers/staging/lirc/lirc_serial.c +@@ -843,18 +843,15 @@ static int __devinit lirc_serial_probe(struct platform_device *dev) + result = request_irq(irq, irq_handler, + IRQF_DISABLED | (share_irq ? IRQF_SHARED : 0), + LIRC_DRIVER_NAME, (void *)&hardware); +- +- switch (result) { +- case -EBUSY: +- printk(KERN_ERR LIRC_DRIVER_NAME ": IRQ %d busy\n", irq); +- return -EBUSY; +- case -EINVAL: +- printk(KERN_ERR LIRC_DRIVER_NAME +- ": Bad irq number or handler\n"); +- return -EINVAL; +- default: +- break; +- }; ++ if (result < 0) { ++ if (result == -EBUSY) ++ printk(KERN_ERR LIRC_DRIVER_NAME ": IRQ %d busy\n", ++ irq); ++ else if (result == -EINVAL) ++ printk(KERN_ERR LIRC_DRIVER_NAME ++ ": Bad irq number or handler\n"); ++ return result; ++ } + + /* Reserve io region. */ + /* +-- +1.7.7.3 + diff --git a/debian/patches/series/base b/debian/patches/series/base index 006059475..de9686c57 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -73,3 +73,9 @@ + features/arm/imx53_ahci5.patch + debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch + ++ bugfix/all/0001-media-staging-lirc_serial-Fix-init-exit-order.patch ++ bugfix/all/0002-media-staging-lirc_serial-Free-resources-on-failure-.patch ++ bugfix/all/0003-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch ++ bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch ++ bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch From 01f077e6d8432a014a602e5aada5bf199910c298 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 26 Nov 2011 03:21:20 +0000 Subject: [PATCH 07/13] amilo-rfkill: Use proper functions to write to the i8042 safely svn path=/dists/sid/linux-2.6/; revision=18318 --- debian/changelog | 1 + ...kill-driver-for-some-Fujitsu-Siemens.patch | 37 ++++++++----------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4528f2511..4d39dd141 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ linux-2.6 (3.1.2-1) UNRELEASED; urgency=low * Include module taint flags in bug reports * lirc_serial: Fix various bugs that may result in a crash, deadlock or other failure (Closes: #645811) + * amilo-rfkill: Use proper functions to write to the i8042 safely -- Ben Hutchings Tue, 22 Nov 2011 05:26:25 +0000 diff --git a/debian/patches/features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch b/debian/patches/features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch index 614a4fd89..2c0cc3d23 100644 --- a/debian/patches/features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch +++ b/debian/patches/features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch @@ -9,15 +9,15 @@ Fujitsu-Siemens Amilo A1655 and M7440 models found at: http://sourceforge.net/projects/fsaa1655g/ http://sourceforge.net/projects/fsam7440/ -This adds DMI matching and replaces the procfs files with rfkill -devices. +This adds DMI matching, replaces the procfs files with rfkill devices, +and uses the proper function to write to the i8042 safely. Signed-off-by: Ben Hutchings --- drivers/platform/x86/Kconfig | 7 ++ drivers/platform/x86/Makefile | 1 + - drivers/platform/x86/amilo-rfkill.c | 180 +++++++++++++++++++++++++++++++++++ - 3 files changed, 188 insertions(+), 0 deletions(-) + drivers/platform/x86/amilo-rfkill.c | 173 +++++++++++++++++++++++++++++++++++ + 3 files changed, 181 insertions(+), 0 deletions(-) create mode 100644 drivers/platform/x86/amilo-rfkill.c diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig @@ -52,10 +52,10 @@ index 293a320..3acbaad 100644 obj-$(CONFIG_IDEAPAD_LAPTOP) += ideapad-laptop.o diff --git a/drivers/platform/x86/amilo-rfkill.c b/drivers/platform/x86/amilo-rfkill.c new file mode 100644 -index 0000000..028d3ec +index 0000000..19170bb --- /dev/null +++ b/drivers/platform/x86/amilo-rfkill.c -@@ -0,0 +1,180 @@ +@@ -0,0 +1,173 @@ +/* + * Support for rfkill on some Fujitsu-Siemens Amilo laptops. + * Copyright 2011 Ben Hutchings. @@ -73,6 +73,7 @@ index 0000000..028d3ec + +#include +#include ++#include +#include +#include +#include @@ -82,27 +83,19 @@ index 0000000..028d3ec + * These values were obtained from disassembling and debugging the + * PM.exe program installed in the Fujitsu-Siemens AMILO A1655G + */ -+#define A1655_STATE_PORT 0x64 -+#define A1655_COMMAND_PORT 0x64 -+#define A1655_DATA_PORT 0x60 -+#define A1655_WIFI_COMMAND 0xC5 ++#define A1655_WIFI_COMMAND 0x10C5 +#define A1655_WIFI_ON 0x25 +#define A1655_WIFI_OFF 0x45 + +static int amilo_a1655_rfkill_set_block(void *data, bool blocked) +{ -+ u8 val; ++ u8 param = blocked ? A1655_WIFI_OFF : A1655_WIFI_ON; ++ int rc; + -+ do -+ val = inb(A1655_STATE_PORT); -+ while ((val & 2) == 2); -+ outb(A1655_WIFI_COMMAND, A1655_COMMAND_PORT); -+ do -+ val = inb(A1655_STATE_PORT); -+ while ((val & 2) == 2); -+ outb(blocked ? A1655_WIFI_OFF : A1655_WIFI_ON, A1655_DATA_PORT); -+ -+ return 0; ++ i8042_lock_chip(); ++ rc = i8042_command(¶m, A1655_WIFI_COMMAND); ++ i8042_unlock_chip(); ++ return rc; +} + +static const struct rfkill_ops amilo_a1655_rfkill_ops = { @@ -237,5 +230,5 @@ index 0000000..028d3ec +module_init(amilo_rfkill_init); +module_exit(amilo_rfkill_exit); -- -1.7.7.2 +1.7.7.3 From 1c05df23445ddf3e8a636450de7eb7ed3ef05426 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 27 Nov 2011 19:50:33 +0000 Subject: [PATCH 08/13] * debian/changelog: Set version to 3.1.3-1. * debian/patches: Remove merged patches. svn path=/dists/sid/linux-2.6/; revision=18326 --- debian/changelog | 3 +- .../all/ark3116-initialisation-fix.patch | 53 ------------------- ...-shrinker-callback-bug-in-fs-super.c.patch | 46 ---------------- debian/patches/series/base | 2 - 4 files changed, 2 insertions(+), 102 deletions(-) delete mode 100644 debian/patches/bugfix/all/ark3116-initialisation-fix.patch delete mode 100644 debian/patches/bugfix/all/vmscan-fix-shrinker-callback-bug-in-fs-super.c.patch diff --git a/debian/changelog b/debian/changelog index 4d39dd141..ad7d0d4c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -linux-2.6 (3.1.2-1) UNRELEASED; urgency=low +linux-2.6 (3.1.3-1) UNRELEASED; urgency=low * New upstream stable update: http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.2 + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.3 [ Martin Michlmayr ] * [armel] Set the priority of pata-modules to standard since the diff --git a/debian/patches/bugfix/all/ark3116-initialisation-fix.patch b/debian/patches/bugfix/all/ark3116-initialisation-fix.patch deleted file mode 100644 index fc2f9354d..000000000 --- a/debian/patches/bugfix/all/ark3116-initialisation-fix.patch +++ /dev/null @@ -1,53 +0,0 @@ -Date: Wed, 26 Oct 2011 13:29:42 +0200 -From: Bart Hartgers -Subject: [PATCH] ark3116 initialisation fix - -Hi, - -This patch for the usb serial ark3116 driver fixes an initialisation -ordering bug that gets triggered on hotplug when using at least recent -debian/ubuntu userspace. Without it, ark3116 serial cables don't work. - -Patch is against 3.1. - -Groeten, -Bart - -Signed-off-by: Bart Hartgers -Tested-by: law_ence.dev@ntlworld.com ---- -diff -ur linux-3.1.orig//drivers/usb/serial/ark3116.c linux-3.1/drivers/usb/serial/ark3116.c ---- linux-3.1.orig//drivers/usb/serial/ark3116.c 2011-10-24 09:10:05.000000000 +0200 -+++ linux-3.1/drivers/usb/serial/ark3116.c 2011-10-26 09:16:41.776874595 +0200 -@@ -42,7 +42,7 @@ - * Version information - */ - --#define DRIVER_VERSION "v0.6" -+#define DRIVER_VERSION "v0.7" - #define DRIVER_AUTHOR "Bart Hartgers " - #define DRIVER_DESC "USB ARK3116 serial/IrDA driver" - #define DRIVER_DEV_DESC "ARK3116 RS232/IrDA" -@@ -380,10 +380,6 @@ - goto err_out; - } - -- /* setup termios */ -- if (tty) -- ark3116_set_termios(tty, port, NULL); -- - /* remove any data still left: also clears error state */ - ark3116_read_reg(serial, UART_RX, buf); - -@@ -406,6 +402,10 @@ - /* enable DMA */ - ark3116_write_reg(port->serial, UART_FCR, UART_FCR_DMA_SELECT); - -+ /* setup termios */ -+ if (tty) -+ ark3116_set_termios(tty, port, NULL); -+ - err_out: - kfree(buf); - return result; - diff --git a/debian/patches/bugfix/all/vmscan-fix-shrinker-callback-bug-in-fs-super.c.patch b/debian/patches/bugfix/all/vmscan-fix-shrinker-callback-bug-in-fs-super.c.patch deleted file mode 100644 index d1eafd2dc..000000000 --- a/debian/patches/bugfix/all/vmscan-fix-shrinker-callback-bug-in-fs-super.c.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Mikulas Patocka -Date: Mon, 31 Oct 2011 17:08:57 -0700 -Subject: [PATCH] vmscan: fix shrinker callback bug in fs/super.c - -commit 09f363c7363eb10cfb4b82094bd7064e5608258b upstream. - -The callback must not return -1 when nr_to_scan is zero. Fix the bug in -fs/super.c and add this requirement to the callback specification. - -Signed-off-by: Mikulas Patocka -Cc: Dave Chinner -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds ---- - fs/super.c | 2 +- - include/linux/shrinker.h | 1 + - 2 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/fs/super.c b/fs/super.c -index 3f56a26..32a81f3 100644 ---- a/fs/super.c -+++ b/fs/super.c -@@ -61,7 +61,7 @@ static int prune_super(struct shrinker *shrink, struct shrink_control *sc) - return -1; - - if (!grab_super_passive(sb)) -- return -1; -+ return !sc->nr_to_scan ? 0 : -1; - - if (sb->s_op && sb->s_op->nr_cached_objects) - fs_objects = sb->s_op->nr_cached_objects(sb); -diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h -index 790651b..a83833a 100644 ---- a/include/linux/shrinker.h -+++ b/include/linux/shrinker.h -@@ -20,6 +20,7 @@ struct shrink_control { - * 'nr_to_scan' entries and attempt to free them up. It should return - * the number of objects which remain in the cache. If it returns -1, it means - * it cannot do any scanning at this time (eg. there is a risk of deadlock). -+ * The callback must not return -1 if nr_to_scan is zero. - * - * The 'gfpmask' refers to the allocation we are currently trying to - * fulfil. --- -1.7.7.2 - diff --git a/debian/patches/series/base b/debian/patches/series/base index de9686c57..eced9b512 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -43,7 +43,6 @@ + bugfix/ia64/ia64-gpio-GENERIC_GPIO-default-must-be-n.patch + features/x86/libertas-prioritize-usb8388_olpc.bin-firmware-on-OLPC-machines.patch + bugfix/arm/ARM-ixp4xx-gpiolib-support.patch -+ bugfix/all/ark3116-initialisation-fix.patch + bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink.patch + bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink-2.patch + bugfix/all/oom-fix-integer-overflow-of-points-in-oom_badness.patch @@ -56,7 +55,6 @@ + bugfix/all/Fix-build-break-when-freezer-not-configured.patch + bugfix/all/PM-Freezer-Reimplement-wait_event_freezekillable-usi.patch + bugfix/all/hfs-fix-hfs_find_init-sb-ext_tree-NULL-ptr-oops.patch -+ bugfix/all/vmscan-fix-shrinker-callback-bug-in-fs-super.c.patch + features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch # Defer until we're sure about the system call number From 0e5c2382cc40ac89d15f1c788f902207c6b6d487 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 28 Nov 2011 03:25:56 +0000 Subject: [PATCH 09/13] Note a Debian bug report fixed by 3.1.3 svn path=/dists/sid/linux-2.6/; revision=18329 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index ad7d0d4c9..f1f5c0491 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ linux-2.6 (3.1.3-1) UNRELEASED; urgency=low * New upstream stable update: http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.2 http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.3 + - TTY: ldisc, wait for ldisc infinitely in hangup (Closes: #645071) [ Martin Michlmayr ] * [armel] Set the priority of pata-modules to standard since the From 343ef5a0ccad8aa41809a8301d7cde92261c1603 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 28 Nov 2011 05:07:47 +0000 Subject: [PATCH 10/13] topology: Provide CPU topology in sysfs in !SMP configurations (Closes: #649216) svn path=/dists/sid/linux-2.6/; revision=18330 --- debian/changelog | 2 + ...U-topology-in-sysfs-in-SMP-configura.patch | 44 +++++++++++++++++++ debian/patches/series/base | 2 + 3 files changed, 48 insertions(+) create mode 100644 debian/patches/features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch diff --git a/debian/changelog b/debian/changelog index f1f5c0491..a98f9e2e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ linux-2.6 (3.1.3-1) UNRELEASED; urgency=low * lirc_serial: Fix various bugs that may result in a crash, deadlock or other failure (Closes: #645811) * amilo-rfkill: Use proper functions to write to the i8042 safely + * topology: Provide CPU topology in sysfs in !SMP configurations + (Closes: #649216) -- Ben Hutchings Tue, 22 Nov 2011 05:26:25 +0000 diff --git a/debian/patches/features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch b/debian/patches/features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch new file mode 100644 index 000000000..215f52c25 --- /dev/null +++ b/debian/patches/features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch @@ -0,0 +1,44 @@ +From: Ben Hutchings +Date: Thu, 24 Nov 2011 07:04:39 +0000 +Subject: [PATCH] topology: Provide CPU topology in sysfs in !SMP + configurations + +commit ccbc60d3e19a1b6ae66ca0d89b3da02dde62088b upstream. + +We should provide topology information to userland even if it's not +very interesting. The current code appears to work properly for !SMP +(tested on i386). + +Reference: http://bugs.debian.org/649216 +Reported-by: Marcus Osdoba +Signed-off-by: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman +--- + drivers/base/Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/base/Makefile b/drivers/base/Makefile +index 99a375a..1334d89 100644 +--- a/drivers/base/Makefile ++++ b/drivers/base/Makefile +@@ -3,7 +3,8 @@ + obj-y := core.o sys.o bus.o dd.o syscore.o \ + driver.o class.o platform.o \ + cpu.o firmware.o init.o map.o devres.o \ +- attribute_container.o transport_class.o ++ attribute_container.o transport_class.o \ ++ topology.o + obj-$(CONFIG_DEVTMPFS) += devtmpfs.o + obj-y += power/ + obj-$(CONFIG_HAS_DMA) += dma-mapping.o +@@ -12,7 +13,6 @@ obj-$(CONFIG_ISA) += isa.o + obj-$(CONFIG_FW_LOADER) += firmware_class.o + obj-$(CONFIG_NUMA) += node.o + obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o +-obj-$(CONFIG_SMP) += topology.o + ifeq ($(CONFIG_SYSFS),y) + obj-$(CONFIG_MODULES) += module.o + endif +-- +1.7.7.3 + diff --git a/debian/patches/series/base b/debian/patches/series/base index eced9b512..92e8b16d2 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -77,3 +77,5 @@ + bugfix/all/0003-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch + bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch + bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch + ++ features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch From 0ec066ddcc5cde14570b98c56349f1235963e58c Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 29 Nov 2011 09:43:16 +0000 Subject: [PATCH 11/13] debian/changelog: Set version to 3.1.4-1. svn path=/dists/sid/linux-2.6/; revision=18331 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a98f9e2e8..f898a9813 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -linux-2.6 (3.1.3-1) UNRELEASED; urgency=low +linux-2.6 (3.1.4-1) UNRELEASED; urgency=low - * New upstream stable update: + * New upstream stable updates: http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.2 http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.3 - TTY: ldisc, wait for ldisc infinitely in hangup (Closes: #645071) + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.4 [ Martin Michlmayr ] * [armel] Set the priority of pata-modules to standard since the From d8fa8c778deb0b7f60fb7620b2c4d69f84ce006e Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 29 Nov 2011 09:54:58 +0000 Subject: [PATCH 12/13] * debian/changelog: Update. * debian/rules.real: Install generated headers. svn path=/dists/sid/linux-2.6/; revision=18332 --- debian/changelog | 3 +++ debian/rules.real | 1 + 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index f898a9813..1b42b47b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,9 @@ linux-2.6 (3.1.4-1) UNRELEASED; urgency=low * topology: Provide CPU topology in sysfs in !SMP configurations (Closes: #649216) + [ Bastian Blank ] + * Include generated headers. (closes: #650085) + -- Ben Hutchings Tue, 22 Nov 2011 05:26:25 +0000 linux-2.6 (3.1.1-1) unstable; urgency=high diff --git a/debian/rules.real b/debian/rules.real index 3e91973b8..e75680196 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -242,6 +242,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$( mkdir -p $(DIR)/arch/$(KERNEL_ARCH)/kernel cp -a $(SOURCE_DIR)/{.config,.kernel*,Module.symvers,include} $(DIR) + cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/include $(DIR)/arch/$(KERNEL_ARCH) cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/kernel/asm-offsets.s $(DIR)/arch/$(KERNEL_ARCH)/kernel ifneq ($(filter powerpc ppc64,$(ARCH)),) From 3cc094b7a102afc1e154ed0c6d27701ed9f0911b Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 29 Nov 2011 13:15:12 +0000 Subject: [PATCH 13/13] debian/changelog: Prepare to release (3.1.4-1). svn path=/dists/sid/linux-2.6/; revision=18333 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1b42b47b1..6054ca1b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-2.6 (3.1.4-1) UNRELEASED; urgency=low +linux-2.6 (3.1.4-1) unstable; urgency=low * New upstream stable updates: http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.2 @@ -24,7 +24,7 @@ linux-2.6 (3.1.4-1) UNRELEASED; urgency=low [ Bastian Blank ] * Include generated headers. (closes: #650085) - -- Ben Hutchings Tue, 22 Nov 2011 05:26:25 +0000 + -- Bastian Blank Tue, 29 Nov 2011 14:14:14 +0100 linux-2.6 (3.1.1-1) unstable; urgency=high