litmus-rt.git, branch v2.6.15-rc1 The LITMUS^RT kernel. Linux v2.6.15-rc1 2005-11-12T01:43:36+00:00 Linus Torvalds torvalds@g5.osdl.org 2005-11-12T01:43:36+00:00 cd52d1ee9a92587b242d946a2300a3245d3b885a As per the new release rules: two weeks of merging, and then an -rc1 and calming down for the next release. 
As per the new release rules: two weeks of merging, and then an -rc1 and
calming down for the next release.
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2005-11-12T01:00:17+00:00 Linus Torvalds torvalds@g5.osdl.org 2005-11-12T01:00:17+00:00 508862e493f1107d17fa5a0015084b1773ffc41e 






Merge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-12T00:30:35+00:00

Linus Torvalds
torvalds@g5.osdl.org

2005-11-12T00:30:35+00:00

9cf93d7b2f4516271ccf5b48f958bd474cf9dd67












Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
2005-11-12T00:29:47+00:00

Linus Torvalds
torvalds@g5.osdl.org

2005-11-12T00:29:47+00:00

401221501af4b87b502eca36ece97b4191380082












Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
2005-11-12T00:29:22+00:00

Linus Torvalds
torvalds@g5.osdl.org

2005-11-12T00:29:22+00:00

63f45b80947cb0819673860f6970f483e2cab21d












[SCTP]: Include ulpevents in socket receive buffer accounting.
2005-11-12T00:08:24+00:00

Neil Horman
nhorman@tuxdriver.com

2005-11-12T00:08:24+00:00

049b3ff5a86d0187184a189d2e31b8654d58fe22

Also introduces a sysctl option to configure the receive buffer
accounting policy to be either at socket or association level.
Default is all the associations on the same socket share the
receive buffer.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>





Also introduces a sysctl option to configure the receive buffer
accounting policy to be either at socket or association level.
Default is all the associations on the same socket share the
receive buffer.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>







[SCTP]: Fix ia64 NaT consumption fault with sctp_sideffect commands.
2005-11-12T00:07:40+00:00

Vladislav Yasevich
vladislav.yasevich@hp.com

2005-11-12T00:07:40+00:00

19c7e9eef503dc1ae926f3d26c56f88bee568d7b

On ia64, it is possible to get NaT Consumption Fault and a kernel panic
when initializing sctp sideeffect commands arguments.  The union
sctp_arg_t contains different sized elements and when loading a smaller
sized element (32 or 16 bits), it is possible for a speculative load to
fail and result in a NaT bit set which causes a kernel crash.  The easy
way to get around it is to load the largerst member of the union.

Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>





On ia64, it is possible to get NaT Consumption Fault and a kernel panic
when initializing sctp sideeffect commands arguments.  The union
sctp_arg_t contains different sized elements and when loading a smaller
sized element (32 or 16 bits), it is possible for a speculative load to
fail and result in a NaT bit set which causes a kernel crash.  The easy
way to get around it is to load the largerst member of the union.

Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>







[SCTP]: Remove timeouts[] array from sctp_endpoint.
2005-11-12T00:06:16+00:00

Vladislav Yasevich
vladislav.yasevich@hp.com

2005-11-12T00:06:16+00:00

1e7d3d90c95b32374057e454417b2f50440be20e

The socket level timeout values are maintained in sctp_sock and
association level timeouts are in sctp_association. So there is
no need for ep->timeouts.

Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>





The socket level timeout values are maintained in sctp_sock and
association level timeouts are in sctp_association. So there is
no need for ep->timeouts.

Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>







[SCTP]: Fix potential NULL pointer dereference in sctp_v4_get_saddr
2005-11-12T00:05:55+00:00

Vladislav Yasevich
vladislav.yasevich@hp.com

2005-11-12T00:05:55+00:00

23ec47a0889dabf4b9e7f8d52e848194734159ee

It is possible to get to sctp_v4_get_saddr() without a valid
association.  This happens when processing OOTB packets and
the cached route entry is no longer valid.
However, when responding to OOTB packets we already properly
set the source address based on the information in the OOTB
packet.  So, if we we get to sctp_v4_get_saddr() without an
association we can simply return.

Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>





It is possible to get to sctp_v4_get_saddr() without a valid
association.  This happens when processing OOTB packets and
the cached route entry is no longer valid.
However, when responding to OOTB packets we already properly
set the source address based on the information in the OOTB
packet.  So, if we we get to sctp_v4_get_saddr() without an
association we can simply return.

Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>







[IPV6]: Fix inet6_init missing unregister.
2005-11-11T23:05:47+00:00

David S. Miller
davem@davemloft.net

2005-11-11T23:05:47+00:00

8eb55910521f3449a8125a38dd32fb676703395d

Based mostly upon a patch from Olaf Kirch <okir@suse.de>

When initialization fails in inet6_init(), we should
unregister the PF_INET6 socket ops.

Also, check sock_register()'s return value for errors.

Signed-off-by: David S. Miller <davem@davemloft.net>





Based mostly upon a patch from Olaf Kirch <okir@suse.de>

When initialization fails in inet6_init(), we should
unregister the PF_INET6 socket ops.

Also, check sock_register()'s return value for errors.

Signed-off-by: David S. Miller <davem@davemloft.net>