drivers/acpi/processor_idle.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
---- linux-2.6.14.3.orig/drivers/acpi/processor_idle.c
-+++ linux-2.6.14.3/drivers/acpi/processor_idle.c
+--- linux-2.6.14.4.orig/drivers/acpi/processor_idle.c
++++ linux-2.6.14.4/drivers/acpi/processor_idle.c
@@ -261,6 +261,16 @@ static void acpi_processor_idle(void)
cx->usage++;
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@redhat.com>
---
-
drivers/acpi/video.c | 2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: linux-2.6.14.y/drivers/acpi/video.c
-===================================================================
---- linux-2.6.14.y.orig/drivers/acpi/video.c
-+++ linux-2.6.14.y/drivers/acpi/video.c
+--- linux-2.6.14.4.orig/drivers/acpi/video.c
++++ linux-2.6.14.4/drivers/acpi/video.c
@@ -813,7 +813,7 @@ acpi_video_device_write_brightness(struc
ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness");
drivers/acpi/processor_idle.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---- linux-2.6.14.3.orig/drivers/acpi/processor_idle.c
-+++ linux-2.6.14.3/drivers/acpi/processor_idle.c
-@@ -687,7 +687,7 @@ static int acpi_processor_get_power_info
+--- linux-2.6.14.4.orig/drivers/acpi/processor_idle.c
++++ linux-2.6.14.4/drivers/acpi/processor_idle.c
+@@ -706,7 +706,7 @@ static int acpi_processor_get_power_info
/* Validate number of power states discovered */
if (pr->power.count < 2)
end:
acpi_os_free(buffer.pointer);
-@@ -838,11 +838,11 @@ static int acpi_processor_get_power_info
+@@ -857,11 +857,11 @@ static int acpi_processor_get_power_info
* this function */
result = acpi_processor_get_power_info_cst(pr);
Signed-off-by: Chris Wright <chrisw@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
drivers/scsi/dpt_i2o.c | 25 ++++++++++++++++++++-----
- 1 files changed, 20 insertions(+), 5 deletions(-)
+ 1 file changed, 20 insertions(+), 5 deletions(-)
-Index: linux-2.6.14.y/drivers/scsi/dpt_i2o.c
-===================================================================
---- linux-2.6.14.y.orig/drivers/scsi/dpt_i2o.c
-+++ linux-2.6.14.y/drivers/scsi/dpt_i2o.c
+--- linux-2.6.14.4.orig/drivers/scsi/dpt_i2o.c
++++ linux-2.6.14.4/drivers/scsi/dpt_i2o.c
@@ -660,7 +660,12 @@ static int adpt_abort(struct scsi_cmnd *
msg[2] = 0;
msg[3]= 0;
Signed-off-by: Chris Wright <chrisw@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
net/bridge/br_netfilter.c | 17 +++++++----------
- 1 files changed, 7 insertions(+), 10 deletions(-)
+ 1 file changed, 7 insertions(+), 10 deletions(-)
-Index: linux-2.6.14.y/net/bridge/br_netfilter.c
-===================================================================
---- linux-2.6.14.y.orig/net/bridge/br_netfilter.c
-+++ linux-2.6.14.y/net/bridge/br_netfilter.c
+--- linux-2.6.14.4.orig/net/bridge/br_netfilter.c
++++ linux-2.6.14.4/net/bridge/br_netfilter.c
@@ -295,7 +295,7 @@ static int check_hbh_len(struct sk_buff
len -= 2;
Signed-off-by: Krzysztof Piotr Oledzki <ole@ans.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---- a/net/ipv4/netfilter/ip_conntrack_netlink.c
-+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
-@@ -503,7 +503,7 @@ ctnetlink_parse_tuple_ip(struct nfattr *
+---
+ net/ipv4/netfilter/ip_conntrack_netlink.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- linux-2.6.14.4.orig/net/ipv4/netfilter/ip_conntrack_netlink.c
++++ linux-2.6.14.4/net/ipv4/netfilter/ip_conntrack_netlink.c
+@@ -506,7 +506,7 @@ nfattr_failure:
}
static const int cta_min_proto[CTA_PROTO_MAX] = {
[CTA_PROTO_SRC_PORT-1] = sizeof(u_int16_t),
[CTA_PROTO_DST_PORT-1] = sizeof(u_int16_t),
[CTA_PROTO_ICMP_TYPE-1] = sizeof(u_int8_t),
-@@ -528,7 +528,7 @@ ctnetlink_parse_tuple_proto(struct nfatt
+@@ -532,7 +532,7 @@ ctnetlink_parse_tuple_proto(struct nfatt
if (!tb[CTA_PROTO_NUM-1])
return -EINVAL;
proto = ip_conntrack_proto_find_get(tuple->dst.protonum);
-_______________________________________________
-stable mailing list
-stable@linux.kernel.org
-http://linux.kernel.org/mailman/listinfo/stable
-
Signed-off-by: Chris Wright <chrisw@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
net/ipv6/netfilter/Kconfig | 2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: linux-2.6.14.y/net/ipv6/netfilter/Kconfig
-===================================================================
---- linux-2.6.14.y.orig/net/ipv6/netfilter/Kconfig
-+++ linux-2.6.14.y/net/ipv6/netfilter/Kconfig
+--- linux-2.6.14.4.orig/net/ipv6/netfilter/Kconfig
++++ linux-2.6.14.4/net/ipv6/netfilter/Kconfig
@@ -211,7 +211,7 @@ config IP6_NF_TARGET_REJECT
config IP6_NF_TARGET_NFQUEUE
Signed-off-by: Chris Wright <chrisw@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
net/ipv4/netfilter/Makefile | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletion(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
-Index: linux-2.6.14.y/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.6.14.y/net/ipv4/netfilter/Makefile
+--- linux-2.6.14.4.orig/net/ipv4/netfilter/Makefile
++++ linux-2.6.14.4/net/ipv4/netfilter/Makefile
@@ -12,6 +12,7 @@ ip_nat_pptp-objs := ip_nat_helper_pptp.o
# connection tracking
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
+ net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
---- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
-+++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+--- linux-2.6.14.4.orig/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
++++ linux-2.6.14.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -341,9 +341,10 @@ static int tcp_print_conntrack(struct se
static int tcp_to_nfattr(struct sk_buff *skb, struct nfattr *nfa,
const struct ip_conntrack *ct)
NFA_PUT(skb, CTA_PROTOINFO_TCP_STATE, sizeof(u_int8_t),
&ct->proto.tcp.state);
read_unlock_bh(&tcp_lock);
-
-_______________________________________________
-stable mailing list
-stable@linux.kernel.org
-http://linux.kernel.org/mailman/listinfo/stable
-
Signed-off-by: Chris Wright <chrisw@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
net/8021q/vlan_dev.c | 3 +++
- 1 files changed, 3 insertions(+)
+ 1 file changed, 3 insertions(+)
-Index: linux-2.6.14.y/net/8021q/vlan_dev.c
-===================================================================
---- linux-2.6.14.y.orig/net/8021q/vlan_dev.c
-+++ linux-2.6.14.y/net/8021q/vlan_dev.c
+--- linux-2.6.14.4.orig/net/8021q/vlan_dev.c
++++ linux-2.6.14.4/net/8021q/vlan_dev.c
@@ -165,6 +165,9 @@ int vlan_skb_recv(struct sk_buff *skb, s
skb_pull(skb, VLAN_HLEN); /* take off the VLAN header (4 bytes currently) */
Signed-off-by: Chris Wright <chrisw@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
net/ipv4/ip_gre.c | 2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: linux-2.6.14.y/net/ipv4/ip_gre.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/ip_gre.c
-+++ linux-2.6.14.y/net/ipv4/ip_gre.c
+--- linux-2.6.14.4.orig/net/ipv4/ip_gre.c
++++ linux-2.6.14.4/net/ipv4/ip_gre.c
@@ -617,7 +617,7 @@ static int ipgre_rcv(struct sk_buff *skb
skb->mac.raw = skb->nh.raw;
Signed-off-by: Chris Wright <chrisw@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
drivers/usb/input/hid-input.c | 1 +
- 1 files changed, 1 insertion(+)
+ 1 file changed, 1 insertion(+)
-Index: linux-2.6.14.y/drivers/usb/input/hid-input.c
-===================================================================
---- linux-2.6.14.y.orig/drivers/usb/input/hid-input.c
-+++ linux-2.6.14.y/drivers/usb/input/hid-input.c
+--- linux-2.6.14.4.orig/drivers/usb/input/hid-input.c
++++ linux-2.6.14.4/drivers/usb/input/hid-input.c
@@ -137,6 +137,7 @@ static void hidinput_configure_usage(str
switch (usage->hid & 0xffff) {
case 0xba: map_abs(ABS_RUDDER); break;
Signed-off-by: Chris Wright <chrisw@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
include/net/xfrm.h | 1 +
net/xfrm/xfrm_policy.c | 19 ++++++++++++++-----
net/xfrm/xfrm_state.c | 5 +++++
3 files changed, 20 insertions(+), 5 deletions(-)
-Index: linux-2.6.14.y/include/net/xfrm.h
-===================================================================
---- linux-2.6.14.y.orig/include/net/xfrm.h
-+++ linux-2.6.14.y/include/net/xfrm.h
+--- linux-2.6.14.4.orig/include/net/xfrm.h
++++ linux-2.6.14.4/include/net/xfrm.h
@@ -890,6 +890,7 @@ struct xfrm_state * xfrm_find_acq(u8 mod
extern void xfrm_policy_flush(void);
extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol);
extern int xfrm_bundle_ok(struct xfrm_dst *xdst, struct flowi *fl, int family);
extern void xfrm_init_pmtu(struct dst_entry *dst);
-Index: linux-2.6.14.y/net/xfrm/xfrm_policy.c
-===================================================================
---- linux-2.6.14.y.orig/net/xfrm/xfrm_policy.c
-+++ linux-2.6.14.y/net/xfrm/xfrm_policy.c
+--- linux-2.6.14.4.orig/net/xfrm/xfrm_policy.c
++++ linux-2.6.14.4/net/xfrm/xfrm_policy.c
@@ -1014,13 +1014,12 @@ int __xfrm_route_forward(struct sk_buff
}
EXPORT_SYMBOL(__xfrm_route_forward);
void xfrm_init_pmtu(struct dst_entry *dst)
{
do {
-Index: linux-2.6.14.y/net/xfrm/xfrm_state.c
-===================================================================
---- linux-2.6.14.y.orig/net/xfrm/xfrm_state.c
-+++ linux-2.6.14.y/net/xfrm/xfrm_state.c
+--- linux-2.6.14.4.orig/net/xfrm/xfrm_state.c
++++ linux-2.6.14.4/net/xfrm/xfrm_state.c
@@ -435,6 +435,8 @@ void xfrm_state_insert(struct xfrm_state
spin_lock_bh(&xfrm_state_lock);
__xfrm_state_insert(x);
Signed-off-by: Chris Wright <chrisw@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
net/ipv6/addrconf.c | 16 ++++++++++++----
net/ipv6/route.c | 2 +-
2 files changed, 13 insertions(+), 5 deletions(-)
-Index: linux-2.6.14.y/net/ipv6/addrconf.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv6/addrconf.c
-+++ linux-2.6.14.y/net/ipv6/addrconf.c
+--- linux-2.6.14.4.orig/net/ipv6/addrconf.c
++++ linux-2.6.14.4/net/ipv6/addrconf.c
@@ -1456,9 +1456,17 @@ void addrconf_prefix_rcv(struct net_devi
not good.
*/
}
if (rt)
dst_release(&rt->u.dst);
-Index: linux-2.6.14.y/net/ipv6/route.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv6/route.c
-+++ linux-2.6.14.y/net/ipv6/route.c
+--- linux-2.6.14.4.orig/net/ipv6/route.c
++++ linux-2.6.14.4/net/ipv6/route.c
@@ -829,7 +829,7 @@ int ip6_route_add(struct in6_rtmsg *rtms
}
Signed-off-by: Chris Wright <chrisw@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
include/linux/rtnetlink.h | 4 ++++
- 1 files changed, 4 insertions(+)
+ 1 file changed, 4 insertions(+)
-Index: linux-2.6.14.y/include/linux/rtnetlink.h
-===================================================================
---- linux-2.6.14.y.orig/include/linux/rtnetlink.h
-+++ linux-2.6.14.y/include/linux/rtnetlink.h
+--- linux-2.6.14.4.orig/include/linux/rtnetlink.h
++++ linux-2.6.14.4/include/linux/rtnetlink.h
@@ -866,6 +866,7 @@ enum rtnetlink_groups {
#define RTNLGRP_IPV4_MROUTE RTNLGRP_IPV4_MROUTE
RTNLGRP_IPV4_ROUTE,