[kernel] r19389 - in dists/sid/linux/debian: . config patches patches/bugfix/all patches/features/all/bql patches/features/all/cpu-devices
Ben Hutchings
benh at alioth.debian.org
Thu Sep 20 04:42:50 UTC 2012
Author: benh
Date: Thu Sep 20 04:42:46 2012
New Revision: 19389
Log:
Update to 3.2.30
Drop a lot of patches that were cherry-picked from it.
Ignore perf_event and sunrpc xprt ABI changes (should be the only ones).
Deleted:
dists/sid/linux/debian/patches/bugfix/all/af_netlink-force-credentials-passing.patch
dists/sid/linux/debian/patches/bugfix/all/af_packet-don-t-emit-packet-on-orig-fanout-group.patch
dists/sid/linux/debian/patches/bugfix/all/af_packet-remove-bug-statement-in-tpacket_destruct_skb.patch
dists/sid/linux/debian/patches/bugfix/all/atm-fix-info-leak-in-getsockopt-so_atmpvc.patch
dists/sid/linux/debian/patches/bugfix/all/atm-fix-info-leak-via-getsockname.patch
dists/sid/linux/debian/patches/bugfix/all/bluetooth-hci-fix-info-leak-in-getsockopt-hci_filter.patch
dists/sid/linux/debian/patches/bugfix/all/bluetooth-hci-fix-info-leak-via-getsockname.patch
dists/sid/linux/debian/patches/bugfix/all/bluetooth-l2cap-fix-info-leak-via-getsockname.patch
dists/sid/linux/debian/patches/bugfix/all/bluetooth-rfcomm-fix-info-leak-in-getsockopt-bt_security.patch
dists/sid/linux/debian/patches/bugfix/all/bluetooth-rfcomm-fix-info-leak-in-ioctl-rfcommgetdevlist.patch
dists/sid/linux/debian/patches/bugfix/all/bluetooth-rfcomm-fix-info-leak-via-getsockname.patch
dists/sid/linux/debian/patches/bugfix/all/dccp-fix-info-leak-via-getsockopt-dccp_sockopt_ccid_tx_info.patch
dists/sid/linux/debian/patches/bugfix/all/e1000e-dos-while-tso-enabled-caused-by-link-partner-with-small-mss.patch
dists/sid/linux/debian/patches/bugfix/all/ipvs-fix-info-leak-in-getsockopt-ip_vs_so_get_timeout.patch
dists/sid/linux/debian/patches/bugfix/all/llc-fix-info-leak-via-getsockname.patch
dists/sid/linux/debian/patches/bugfix/all/net-allow-driver-to-limit-number-of-gso-segments-per-skb.patch
dists/sid/linux/debian/patches/bugfix/all/net-fix-info-leak-in-compat-dev_ifconf.patch
dists/sid/linux/debian/patches/bugfix/all/net-ipv4-ipmr_expire_timer-causes-crash-when-removing-net-namespace.patch
dists/sid/linux/debian/patches/bugfix/all/net_sched-gact-fix-potential-panic-in-tcf_gact.patch
dists/sid/linux/debian/patches/bugfix/all/netlink-fix-possible-spoofing-from-non-root-processes.patch
dists/sid/linux/debian/patches/bugfix/all/remove-user-triggerable-bug-from-mpol_to_str.patch
dists/sid/linux/debian/patches/bugfix/all/sfc-fix-maximum-number-of-tso-segments-and-minimum-tx-queue-size.patch
dists/sid/linux/debian/patches/bugfix/all/tcp-apply-device-tso-segment-limit-earlier.patch
Modified:
dists/sid/linux/debian/changelog
dists/sid/linux/debian/config/defines
dists/sid/linux/debian/patches/features/all/bql/e1000e-support-for-byte-queue-limits.patch
dists/sid/linux/debian/patches/features/all/cpu-devices/cpu-convert-cpu-and-machinecheck-sysdev_class-to-a-r.patch
dists/sid/linux/debian/patches/series
Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog Thu Sep 20 01:41:17 2012 (r19388)
+++ dists/sid/linux/debian/changelog Thu Sep 20 04:42:46 2012 (r19389)
@@ -1,4 +1,4 @@
-linux (3.2.29-2) UNRELEASED; urgency=low
+linux (3.2.30-1) UNRELEASED; urgency=low
* [s390/s390x-tape] udeb: Remove fuse-modules configuration (fixes FTBFS)
Modified: dists/sid/linux/debian/config/defines
==============================================================================
--- dists/sid/linux/debian/config/defines Thu Sep 20 01:41:17 2012 (r19388)
+++ dists/sid/linux/debian/config/defines Thu Sep 20 04:42:46 2012 (r19389)
@@ -1,7 +1,8 @@
[abi]
abiname: 4
ignore-changes:
- module:drivers/net/wireless/ath/*
+ perf_*
+ xprt_*
[base]
arches:
Modified: dists/sid/linux/debian/patches/features/all/bql/e1000e-support-for-byte-queue-limits.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/all/bql/e1000e-support-for-byte-queue-limits.patch Thu Sep 20 01:41:17 2012 (r19388)
+++ dists/sid/linux/debian/patches/features/all/bql/e1000e-support-for-byte-queue-limits.patch Thu Sep 20 04:42:46 2012 (r19389)
@@ -13,11 +13,9 @@
drivers/net/ethernet/intel/e1000e/netdev.c | 9 +++++++++
1 file changed, 9 insertions(+)
-diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
-index a5bd7a3..c6e9763 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
-@@ -1079,6 +1079,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
+@@ -1111,6 +1111,7 @@ static bool e1000_clean_tx_irq(struct e1
unsigned int i, eop;
unsigned int count = 0;
unsigned int total_tx_bytes = 0, total_tx_packets = 0;
@@ -25,7 +23,7 @@
i = tx_ring->next_to_clean;
eop = tx_ring->buffer_info[i].next_to_watch;
-@@ -1096,6 +1097,10 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
+@@ -1128,6 +1129,10 @@ static bool e1000_clean_tx_irq(struct e1
if (cleaned) {
total_tx_packets += buffer_info->segs;
total_tx_bytes += buffer_info->bytecount;
@@ -36,7 +34,7 @@
}
e1000_put_txbuf(adapter, buffer_info);
-@@ -1114,6 +1119,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
+@@ -1146,6 +1151,8 @@ static bool e1000_clean_tx_irq(struct e1
tx_ring->next_to_clean = i;
@@ -45,7 +43,7 @@
#define TX_WAKE_THRESHOLD 32
if (count && netif_carrier_ok(netdev) &&
e1000_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD) {
-@@ -2240,6 +2247,7 @@ static void e1000_clean_tx_ring(struct e1000_adapter *adapter)
+@@ -2276,6 +2283,7 @@ static void e1000_clean_tx_ring(struct e
e1000_put_txbuf(adapter, buffer_info);
}
@@ -53,11 +51,11 @@
size = sizeof(struct e1000_buffer) * tx_ring->count;
memset(tx_ring->buffer_info, 0, size);
-@@ -5027,6 +5035,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
- /* if count is 0 then mapping error has occurred */
- count = e1000_tx_map(adapter, skb, first, max_per_txd, nr_frags, mss);
+@@ -4997,6 +5005,7 @@ static netdev_tx_t e1000_xmit_frame(stru
+ count = e1000_tx_map(adapter, skb, first, adapter->tx_fifo_limit,
+ nr_frags);
if (count) {
+ netdev_sent_queue(netdev, skb->len);
e1000_tx_queue(adapter, tx_flags, count);
/* Make sure there is space in the ring for the next send. */
- e1000_maybe_stop_tx(netdev, MAX_SKB_FRAGS + 2);
+ e1000_maybe_stop_tx(netdev,
Modified: dists/sid/linux/debian/patches/features/all/cpu-devices/cpu-convert-cpu-and-machinecheck-sysdev_class-to-a-r.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/all/cpu-devices/cpu-convert-cpu-and-machinecheck-sysdev_class-to-a-r.patch Thu Sep 20 01:41:17 2012 (r19388)
+++ dists/sid/linux/debian/patches/features/all/cpu-devices/cpu-convert-cpu-and-machinecheck-sysdev_class-to-a-r.patch Thu Sep 20 04:42:46 2012 (r19389)
@@ -650,7 +650,7 @@
return count; \
}
-@@ -178,22 +178,22 @@ SYSFS_PMCSETUP(purr, SPRN_PURR);
+@@ -178,16 +178,16 @@ SYSFS_PMCSETUP(purr, SPRN_PURR);
SYSFS_PMCSETUP(spurr, SPRN_SPURR);
SYSFS_PMCSETUP(dscr, SPRN_DSCR);
@@ -673,6 +673,9 @@
{
return sprintf(buf, "%lx\n", dscr_default);
}
+@@ -200,8 +200,8 @@ static void update_dscr(void *dummy)
+ }
+ }
-static ssize_t __used store_dscr_default(struct sysdev_class *class,
- struct sysdev_class_attribute *attr, const char *buf,
@@ -681,7 +684,7 @@
size_t count)
{
unsigned long val;
-@@ -207,15 +207,14 @@ static ssize_t __used store_dscr_default
+@@ -217,15 +217,14 @@ static ssize_t __used store_dscr_default
return count;
}
@@ -699,7 +702,7 @@
}
#endif /* CONFIG_PPC64 */
-@@ -259,72 +258,72 @@ SYSFS_PMCSETUP(tsr3, SPRN_PA6T_TSR3);
+@@ -269,72 +268,72 @@ SYSFS_PMCSETUP(tsr3, SPRN_PA6T_TSR3);
#endif /* HAS_PPC_PMC_PA6T */
#ifdef HAS_PPC_PMC_IBM
@@ -825,7 +828,7 @@
#endif /* CONFIG_DEBUG_KERNEL */
};
#endif /* HAS_PPC_PMC_PA6T */
-@@ -333,14 +332,14 @@ static struct sysdev_attribute pa6t_attr
+@@ -343,14 +342,14 @@ static struct sysdev_attribute pa6t_attr
static void __cpuinit register_cpu_online(unsigned int cpu)
{
struct cpu *c = &per_cpu(cpu_devices, cpu);
@@ -843,7 +846,7 @@
#endif
/* PMC stuff */
-@@ -348,14 +347,14 @@ static void __cpuinit register_cpu_onlin
+@@ -358,14 +357,14 @@ static void __cpuinit register_cpu_onlin
#ifdef HAS_PPC_PMC_IBM
case PPC_PMC_IBM:
attrs = ibm_common_attrs;
@@ -860,7 +863,7 @@
pmc_attrs = classic_pmc_attrs;
break;
#endif /* HAS_PPC_PMC_G4 */
-@@ -363,7 +362,7 @@ static void __cpuinit register_cpu_onlin
+@@ -373,7 +372,7 @@ static void __cpuinit register_cpu_onlin
case PPC_PMC_PA6T:
/* PA Semi starts counting at PMC0 */
attrs = pa6t_attrs;
@@ -869,7 +872,7 @@
pmc_attrs = NULL;
break;
#endif /* HAS_PPC_PMC_PA6T */
-@@ -374,24 +373,24 @@ static void __cpuinit register_cpu_onlin
+@@ -384,24 +383,24 @@ static void __cpuinit register_cpu_onlin
}
for (i = 0; i < nattrs; i++)
@@ -900,7 +903,7 @@
#endif /* CONFIG_PPC64 */
cacheinfo_cpu_online(cpu);
-@@ -401,8 +400,8 @@ static void __cpuinit register_cpu_onlin
+@@ -411,8 +410,8 @@ static void __cpuinit register_cpu_onlin
static void unregister_cpu_online(unsigned int cpu)
{
struct cpu *c = &per_cpu(cpu_devices, cpu);
@@ -911,7 +914,7 @@
int i, nattrs;
BUG_ON(!c->hotpluggable);
-@@ -410,7 +409,7 @@ static void unregister_cpu_online(unsign
+@@ -420,7 +419,7 @@ static void unregister_cpu_online(unsign
#ifdef CONFIG_PPC64
if (!firmware_has_feature(FW_FEATURE_ISERIES) &&
cpu_has_feature(CPU_FTR_SMT))
@@ -920,7 +923,7 @@
#endif
/* PMC stuff */
-@@ -418,14 +417,14 @@ static void unregister_cpu_online(unsign
+@@ -428,14 +427,14 @@ static void unregister_cpu_online(unsign
#ifdef HAS_PPC_PMC_IBM
case PPC_PMC_IBM:
attrs = ibm_common_attrs;
@@ -937,7 +940,7 @@
pmc_attrs = classic_pmc_attrs;
break;
#endif /* HAS_PPC_PMC_G4 */
-@@ -433,7 +432,7 @@ static void unregister_cpu_online(unsign
+@@ -443,7 +442,7 @@ static void unregister_cpu_online(unsign
case PPC_PMC_PA6T:
/* PA Semi starts counting at PMC0 */
attrs = pa6t_attrs;
@@ -946,7 +949,7 @@
pmc_attrs = NULL;
break;
#endif /* HAS_PPC_PMC_PA6T */
-@@ -444,24 +443,24 @@ static void unregister_cpu_online(unsign
+@@ -454,24 +453,24 @@ static void unregister_cpu_online(unsign
}
for (i = 0; i < nattrs; i++)
@@ -977,7 +980,7 @@
#endif /* CONFIG_PPC64 */
cacheinfo_cpu_offline(cpu);
-@@ -513,70 +512,70 @@ static struct notifier_block __cpuinitda
+@@ -523,70 +522,70 @@ static struct notifier_block __cpuinitda
static DEFINE_MUTEX(cpu_mutex);
@@ -1064,7 +1067,7 @@
/* NUMA stuff */
-@@ -590,7 +589,7 @@ static void register_nodes(void)
+@@ -600,7 +599,7 @@ static void register_nodes(void)
register_one_node(i);
}
@@ -1073,7 +1076,7 @@
{
struct node *node = &node_devices[nid];
return sysfs_create_link(&node->sysdev.kobj, &dev->kobj,
-@@ -598,7 +597,7 @@ int sysfs_add_device_to_node(struct sys_
+@@ -608,7 +607,7 @@ int sysfs_add_device_to_node(struct sys_
}
EXPORT_SYMBOL_GPL(sysfs_add_device_to_node);
@@ -1082,7 +1085,7 @@
{
struct node *node = &node_devices[nid];
sysfs_remove_link(&node->sysdev.kobj, kobject_name(&dev->kobj));
-@@ -614,14 +613,14 @@ static void register_nodes(void)
+@@ -624,14 +623,14 @@ static void register_nodes(void)
#endif
/* Only valid if CPU is present. */
@@ -1102,7 +1105,7 @@
static int __init topology_init(void)
{
-@@ -646,7 +645,7 @@ static int __init topology_init(void)
+@@ -656,7 +655,7 @@ static int __init topology_init(void)
if (cpu_online(cpu) || c->hotpluggable) {
register_cpu(c, cpu);
@@ -2558,7 +2561,7 @@
#include <linux/syscore_ops.h>
#include <linux/delay.h>
#include <linux/ctype.h>
-@@ -1778,7 +1778,7 @@ static struct syscore_ops mce_syscore_op
+@@ -1776,7 +1776,7 @@ static struct syscore_ops mce_syscore_op
};
/*
@@ -2567,7 +2570,7 @@
*/
static void mce_cpu_restart(void *data)
-@@ -1814,27 +1814,28 @@ static void mce_enable_ce(void *all)
+@@ -1812,27 +1812,28 @@ static void mce_enable_ce(void *all)
__mcheck_cpu_init_timer();
}
@@ -2601,7 +2604,7 @@
const char *buf, size_t size)
{
u64 new;
-@@ -1849,14 +1850,14 @@ static ssize_t set_bank(struct sys_devic
+@@ -1847,14 +1848,14 @@ static ssize_t set_bank(struct sys_devic
}
static ssize_t
@@ -2618,7 +2621,7 @@
const char *buf, size_t siz)
{
char *p;
-@@ -1871,8 +1872,8 @@ static ssize_t set_trigger(struct sys_de
+@@ -1869,8 +1870,8 @@ static ssize_t set_trigger(struct sys_de
return strlen(mce_helper) + !!p;
}
@@ -2629,7 +2632,7 @@
const char *buf, size_t size)
{
u64 new;
-@@ -1895,8 +1896,8 @@ static ssize_t set_ignore_ce(struct sys_
+@@ -1893,8 +1894,8 @@ static ssize_t set_ignore_ce(struct sys_
return size;
}
@@ -2640,7 +2643,7 @@
const char *buf, size_t size)
{
u64 new;
-@@ -1918,108 +1919,107 @@ static ssize_t set_cmci_disabled(struct
+@@ -1916,108 +1917,107 @@ static ssize_t set_cmci_disabled(struct
return size;
}
@@ -2794,7 +2797,7 @@
}
/* Make sure there are no machine checks on offlined CPUs. */
-@@ -2069,7 +2069,7 @@ mce_cpu_callback(struct notifier_block *
+@@ -2067,7 +2067,7 @@ mce_cpu_callback(struct notifier_block *
switch (action) {
case CPU_ONLINE:
case CPU_ONLINE_FROZEN:
@@ -2803,7 +2806,7 @@
if (threshold_cpu_callback)
threshold_cpu_callback(action, cpu);
break;
-@@ -2077,7 +2077,7 @@ mce_cpu_callback(struct notifier_block *
+@@ -2075,7 +2075,7 @@ mce_cpu_callback(struct notifier_block *
case CPU_DEAD_FROZEN:
if (threshold_cpu_callback)
threshold_cpu_callback(action, cpu);
@@ -2812,7 +2815,7 @@
break;
case CPU_DOWN_PREPARE:
case CPU_DOWN_PREPARE_FROZEN:
-@@ -2111,7 +2111,7 @@ static __init void mce_init_banks(void)
+@@ -2109,7 +2109,7 @@ static __init void mce_init_banks(void)
for (i = 0; i < banks; i++) {
struct mce_bank *b = &mce_banks[i];
@@ -2821,7 +2824,7 @@
sysfs_attr_init(&a->attr);
a->attr.name = b->attrname;
-@@ -2131,16 +2131,16 @@ static __init int mcheck_init_device(voi
+@@ -2129,16 +2129,16 @@ static __init int mcheck_init_device(voi
if (!mce_available(&boot_cpu_data))
return -EIO;
@@ -2851,7 +2854,7 @@
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/sysfs.h>
-@@ -581,7 +580,7 @@ static __cpuinit int threshold_create_ba
+@@ -578,7 +577,7 @@ static __cpuinit int threshold_create_ba
if (!b)
goto out;
@@ -2860,7 +2863,7 @@
b->kobj, name);
if (err)
goto out;
-@@ -604,7 +603,7 @@ static __cpuinit int threshold_create_ba
+@@ -601,7 +600,7 @@ static __cpuinit int threshold_create_ba
goto out;
}
@@ -2869,7 +2872,7 @@
if (!b->kobj)
goto out_free;
-@@ -624,7 +623,7 @@ static __cpuinit int threshold_create_ba
+@@ -621,7 +620,7 @@ static __cpuinit int threshold_create_ba
if (i == cpu)
continue;
@@ -2878,7 +2881,7 @@
b->kobj, name);
if (err)
goto out;
-@@ -702,7 +701,7 @@ static void threshold_remove_bank(unsign
+@@ -699,7 +698,7 @@ static void threshold_remove_bank(unsign
#ifdef CONFIG_SMP
/* sibling symlink */
if (shared_bank[bank] && b->blocks->cpu != cpu) {
@@ -2887,7 +2890,7 @@
per_cpu(threshold_banks, cpu)[bank] = NULL;
return;
-@@ -714,7 +713,7 @@ static void threshold_remove_bank(unsign
+@@ -711,7 +710,7 @@ static void threshold_remove_bank(unsign
if (i == cpu)
continue;
@@ -4289,7 +4292,7 @@
/* Stop CPUs going up and down. */
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -8136,54 +8136,52 @@ static ssize_t sched_power_savings_store
+@@ -8139,54 +8139,52 @@ static ssize_t sched_power_savings_store
}
#ifdef CONFIG_SCHED_MC
Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series Thu Sep 20 01:41:17 2012 (r19388)
+++ dists/sid/linux/debian/patches/series Thu Sep 20 04:42:46 2012 (r19389)
@@ -396,28 +396,3 @@
bugfix/x86/drm-i915-i8xx-interrupt-handler.patch
features/arm/ahci-Add-JMicron-362-device-IDs.patch
bugfix/all/speakup-lower-default-software-speech-rate.patch
-
-# These were all picked from the 3.2.30 patch queue
-bugfix/all/e1000e-dos-while-tso-enabled-caused-by-link-partner-with-small-mss.patch
-bugfix/all/remove-user-triggerable-bug-from-mpol_to_str.patch
-bugfix/all/net-allow-driver-to-limit-number-of-gso-segments-per-skb.patch
-bugfix/all/sfc-fix-maximum-number-of-tso-segments-and-minimum-tx-queue-size.patch
-bugfix/all/tcp-apply-device-tso-segment-limit-earlier.patch
-bugfix/all/net_sched-gact-fix-potential-panic-in-tcf_gact.patch
-bugfix/all/af_packet-remove-bug-statement-in-tpacket_destruct_skb.patch
-bugfix/all/atm-fix-info-leak-in-getsockopt-so_atmpvc.patch
-bugfix/all/atm-fix-info-leak-via-getsockname.patch
-bugfix/all/bluetooth-hci-fix-info-leak-in-getsockopt-hci_filter.patch
-bugfix/all/bluetooth-hci-fix-info-leak-via-getsockname.patch
-bugfix/all/bluetooth-rfcomm-fix-info-leak-in-getsockopt-bt_security.patch
-bugfix/all/bluetooth-rfcomm-fix-info-leak-in-ioctl-rfcommgetdevlist.patch
-bugfix/all/bluetooth-rfcomm-fix-info-leak-via-getsockname.patch
-bugfix/all/bluetooth-l2cap-fix-info-leak-via-getsockname.patch
-bugfix/all/llc-fix-info-leak-via-getsockname.patch
-bugfix/all/dccp-fix-info-leak-via-getsockopt-dccp_sockopt_ccid_tx_info.patch
-bugfix/all/ipvs-fix-info-leak-in-getsockopt-ip_vs_so_get_timeout.patch
-bugfix/all/net-fix-info-leak-in-compat-dev_ifconf.patch
-bugfix/all/af_packet-don-t-emit-packet-on-orig-fanout-group.patch
-bugfix/all/af_netlink-force-credentials-passing.patch
-bugfix/all/netlink-fix-possible-spoofing-from-non-root-processes.patch
-bugfix/all/net-ipv4-ipmr_expire_timer-causes-crash-when-removing-net-namespace.patch
More information about the Kernel-svn-changes
mailing list