commit 3e1ec1f43307575d4e04c513aa3c30d69c32b9dc tree 5417813a188df32e49e55515d50b975f7ccbe50a parent bcb97940f31ded5ac551da8bfc849583203fc6f2 parent ecfa4fdca15c089e372095325d9e78264224aeb3 author Linus Torvalds Mon, 19 Dec 2005 18:34:37 -0800 committer Linus Torvalds Mon, 19 Dec 2005 18:34:37 -0800 Merge branch 'to_linus' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb commit bcb97940f31ded5ac551da8bfc849583203fc6f2 tree 45fe99d622583afc2a433f8a6dbc949937fbbcd6 parent f98d2dfd02183e016a6295f72140c60d691c9188 author Neil Brown Tue, 20 Dec 2005 11:07:00 +1100 committer Linus Torvalds Mon, 19 Dec 2005 16:47:50 -0800 [PATCH] md: Change case of raid level reported in sys/mdX/md/level I had thought that keeping the reported tail level clearly different from the module name was a good idea, but I've changed my mind. 'raid5' is better and probably less confusing than 'RAID-5'. Signed-off-by: Neil Brown Signed-off-by: Linus Torvalds commit f98d2dfd02183e016a6295f72140c60d691c9188 tree d92ac89a1e5096f979bb93029b3f06e46973e7ca parent 931b11be325e0e866b64bac7cab64d51c7759371 author Ben Collins Mon, 19 Dec 2005 11:49:24 -0800 committer Linus Torvalds Mon, 19 Dec 2005 16:47:50 -0800 [PATCH] block: Cleanup CDROMEJECT ioctl This is just a basic cleanup. No change in functionality. Signed-off-by: Ben Collins Signed-off-by: Linus Torvalds commit 931b11be325e0e866b64bac7cab64d51c7759371 tree 1160085424552859138cf6b92acfbc66d86e64b8 parent 546ac8a63186a06e5d21778eefa4695232aee5b8 parent 38690194bc897dd60a61a71b15e861e13b5d8bdd author Linus Torvalds Mon, 19 Dec 2005 16:46:14 -0800 committer Linus Torvalds Mon, 19 Dec 2005 16:46:14 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6 commit 546ac8a63186a06e5d21778eefa4695232aee5b8 tree 9af42a244753596cd30ac90473fe9f76ee7e9b7e parent ce7fa1b3f9105873f6e26edb7241c848cab70e4d parent ce37e5f90366cb90320a285edd2113fd807f3ab6 author Linus Torvalds Mon, 19 Dec 2005 16:43:57 -0800 committer Linus Torvalds Mon, 19 Dec 2005 16:43:57 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit ce7fa1b3f9105873f6e26edb7241c848cab70e4d tree ef88e085dbf26fa10970759876df80adb4a1ae46 parent d898d485e721db45be555c27df5de03281f2fd05 parent 9bffc4ace1ed875667dbe5b29065d96bec558c62 author Linus Torvalds Mon, 19 Dec 2005 16:43:36 -0800 committer Linus Torvalds Mon, 19 Dec 2005 16:43:36 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit d898d485e721db45be555c27df5de03281f2fd05 tree 2da2fb89a2dd309ef2fd2c651ca87027134c4073 parent df7addbb45874f0f992266003155de5a22e1872f parent 7c612bfd4ed3064fd48a4877a114c8186547367b author Linus Torvalds Mon, 19 Dec 2005 16:43:13 -0800 committer Linus Torvalds Mon, 19 Dec 2005 16:43:13 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 38690194bc897dd60a61a71b15e861e13b5d8bdd tree e22bcf8fa17bb374beff14a8fb693334e6e99f19 parent b401e9e2ec44a5fc1d8053546276bff584b7118e author Michael Chan Mon, 19 Dec 2005 16:27:28 -0800 committer David S. Miller Mon, 19 Dec 2005 16:27:28 -0800 [TG3]: Fix ethtool memory test Skip the memory 0xb50 to 0x1000 during "ethtool -t" memory test. Overwriting memory in this region can cause ASF problems. Update version and release date. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit b401e9e2ec44a5fc1d8053546276bff584b7118e tree 3f554445d377269c941688d2ce23479bd198d8a3 parent dc56b7d46dd2b303a844166ef931270b882bf08c author Michael Chan Mon, 19 Dec 2005 16:27:04 -0800 committer David S. Miller Mon, 19 Dec 2005 16:27:04 -0800 [TG3]: Add tw32_wait_f() for some sensitive registers The tw32_f() function (register write with immediate read flush) can hang when used on some registers to switch clock frequencies and power. A new tw32_wait_f() is added for such registers with the delay before the read and after the read. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit dc56b7d46dd2b303a844166ef931270b882bf08c tree 80b4270d0addf4cf335b9dd47e5c4507c8f8a7b6 parent 8c2dc7e1e7213c55f1b97eba09de6c0cee9ad12f author Michael Chan Mon, 19 Dec 2005 16:26:28 -0800 committer David S. Miller Mon, 19 Dec 2005 16:26:28 -0800 [TG3]: Some low power fixes Add some missing workarounds in tg3_set_power_state(): 1. Workaround to prevent overdrawing current on 5714. 2. Do not power down 5700's PHY because of hw limitation. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 8c2dc7e1e7213c55f1b97eba09de6c0cee9ad12f tree 47bc9b91cc44c68701004494bb9dc9d777ba27a4 parent df7addbb45874f0f992266003155de5a22e1872f author Michael Chan Mon, 19 Dec 2005 16:26:02 -0800 committer David S. Miller Mon, 19 Dec 2005 16:26:02 -0800 [TG3]: Fix peer device handling Locate the pdev_peer for dual port 5714 NIC devices in addition to 5704 devices. The name is also changed to tg3_find_peer() from tg3_find_5704_peer(). It is also necessary to call netdev_priv() to get to the peer's private tg3 structure. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit ce37e5f90366cb90320a285edd2113fd807f3ab6 tree a7cd328af50a2434dc0ccd0056b941df04837cc6 parent df7addbb45874f0f992266003155de5a22e1872f author Adrian Bunk Mon, 19 Dec 2005 14:52:24 -0800 committer David S. Miller Mon, 19 Dec 2005 14:52:24 -0800 [SPARC]: Fix RTC build failure. On sparc and sparc64, the rtc driver doesn't compile with PCI support disabled. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 9bffc4ace1ed875667dbe5b29065d96bec558c62 tree 8f6f3823c2656b89f15c5438dd711860502d64b8 parent 399c180ac5f0cb66ef9479358e0b8b6bafcbeafe author Neil Horman Mon, 19 Dec 2005 14:24:40 -0800 committer David S. Miller Mon, 19 Dec 2005 14:24:40 -0800 [SCTP]: Fix sctp to not return erroneous POLLOUT events. Make sctp_writeable() use sk_wmem_alloc rather than sk_wmem_queued to determine the sndbuf space available. It also removes all the modifications to sk_wmem_queued as it is not currently used in SCTP. Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 399c180ac5f0cb66ef9479358e0b8b6bafcbeafe tree 4014154b7800e96058d94f78dc34a53681e8d5e5 parent 9e999993c71e1506378d26d81f842277aff8a250 author David S. Miller Mon, 19 Dec 2005 14:23:23 -0800 committer David S. Miller Mon, 19 Dec 2005 14:23:23 -0800 [IPSEC]: Perform SA switchover immediately. When we insert a new xfrm_state which potentially subsumes an existing one, make sure all cached bundles are flushed so that the new SA is used immediately. Signed-off-by: David S. Miller commit 7c612bfd4ed3064fd48a4877a114c8186547367b tree bd307ea5bf9c0ad16ad1a590490d9095107d35fc parent 567bd98017d9c9f2ac1c148ddc78c062e8abd398 author Nicolas Pitre Mon, 19 Dec 2005 22:20:51 +0000 committer Russell King Mon, 19 Dec 2005 22:20:51 +0000 [ARM] 3210/1: add missing memory barrier helper for NPTL support Patch from Nicolas Pitre Strictly speaking, the NPTL kernel helpers are required for pre ARMv6 only. They are available on ARMv6+ as well for obvious compatibility reasons. However there are cases where extra memory barriers are needed when using an SMP ARMv6 machine but not on pre-ARMv6. This patch adds a memory barrier kernel helper that glibc can use as needed for pre-ARMv6 binaries to be forward compatible with an SMP kernel on ARMv6, as well as the necessary dmb instructions to the cmpxchg helper. Signed-off-by: Nicolas Pitre Acked-by: Daniel Jacobowitz Signed-off-by: Russell King commit 9e999993c71e1506378d26d81f842277aff8a250 tree 29f17b34f01f83928b23ada0da3f8ea9e0e1b027 parent 3dd4bc68fac5df16b6d3ed6ed3c29cf05f29a47e author Patrick McHardy Mon, 19 Dec 2005 14:03:46 -0800 committer David S. Miller Mon, 19 Dec 2005 14:03:46 -0800 [XFRM]: Handle DCCP in xfrm{4,6}_decode_session Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3dd4bc68fac5df16b6d3ed6ed3c29cf05f29a47e tree 854f73bd7862354eac94b624d436b59fdd5ffecb parent b03664869aa6f84c3c98a06ac9d6905b195909bc author YOSHIFUJI Hideaki Mon, 19 Dec 2005 14:02:45 -0800 committer David S. Miller Mon, 19 Dec 2005 14:02:45 -0800 [IPV6]: Fix route lifetime. The route expiration time is stored in rt6i_expires in jiffies. The argument of rt6_route_add() for adding a route is not the expiration time in jiffies nor in clock_t, but the lifetime (or time left before expiration) in clock_t. Because of the confusion, we sometimes saw several strange errors (FAILs) in TAHI IPv6 Ready Logo Phase-2 Self Test. The symptoms were analyzed by Mitsuru Chinen . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit b03664869aa6f84c3c98a06ac9d6905b195909bc tree 222958ab671d7a0493f530bfe3243c119f7c01fe parent 6b80ebedbee87c5b2213fc3635bf0bd7450bce30 author Bart De Schuymer Mon, 19 Dec 2005 14:00:08 -0800 committer David S. Miller Mon, 19 Dec 2005 14:00:08 -0800 [BRIDGE-NF]: Fix bridge-nf ipv6 length check A typo caused some bridged IPv6 packets to get dropped randomly, as reported by Sebastien Chaumontet. The patch below fixes this (using skb->nh.raw instead of raw) and also makes the jumbo packet length checking up-to-date with the code in net/ipv6/exthdrs.c::ipv6_hop_jumbo. Signed-off-by: Bart De Schuymer Signed-off-by: David S. Miller commit 6b80ebedbee87c5b2213fc3635bf0bd7450bce30 tree fc36ebd3aa924a2d0a85226faa750429a80867d9 parent 31cb5bd4dc89ba14e6347b094e15a2f6778a01fc author Kristian Slavov Mon, 19 Dec 2005 13:54:44 -0800 committer David S. Miller Mon, 19 Dec 2005 13:54:44 -0800 [RTNETLINK]: Fix RTNLGRP definitions in rtnetlink.h I reported a problem and gave hints to the solution, but nobody seemed to react. So I prepared a patch against 2.6.14.4. Tested on 2.6.14.4 with "ip monitor addr" and with the program attached, while adding and removing IPv6 address. Both programs didn't receive any messages. Tested 2.6.14.4 + this patch, and both programs received add and remove messages. Signed-off-by: Kristian Slavov Acked-by: Jamal Hadi salim ACKed-by: Patrick McHardy Signed-off-by: David S. Miller commit 31cb5bd4dc89ba14e6347b094e15a2f6778a01fc tree 8fd17c84c3a09cd5cd612527706fd3124dd88c22 parent 0476f171affa6eca62021fca2ae9f5140acc3713 author Patrick McHardy Mon, 19 Dec 2005 13:53:26 -0800 committer David S. Miller Mon, 19 Dec 2005 13:53:26 -0800 [NETFILTER]: Fix incorrect dependency for IP6_NF_TARGET_NFQUEUE IP6_NF_TARGET_NFQUEUE depends on IP6_NF_IPTABLES, not IP_NF_IPTABLES. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0476f171affa6eca62021fca2ae9f5140acc3713 tree 79128848309e1eacfd916acf3f033cfe4cef4590 parent df7addbb45874f0f992266003155de5a22e1872f author Patrick McHardy Mon, 19 Dec 2005 13:53:09 -0800 committer David S. Miller Mon, 19 Dec 2005 13:53:09 -0800 [NETFILTER]: Fix NAT init order As noticed by Phil Oester, the GRE NAT protocol helper is initialized before the NAT core, which makes registration fail. Change the linking order to make NAT be initialized first. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ecfa4fdca15c089e372095325d9e78264224aeb3 tree 870ae4296ae7653d4e996132d5dffb1843782c56 parent 468a0a54aabdac72e9c7bbd4f8372f1df2d9f0ae author Mauro Carvalho Chehab Mon, 19 Dec 2005 09:15:13 -0200 committer Mauro Carvalho Chehab Mon, 19 Dec 2005 09:15:13 -0200 [PATCH] V4L/DVB SCM Maintainers Update - This patch updates MAINTAINERS file by replacing quilt to git SCM Signed-off-by: Mauro Carvalho Chehab commit 468a0a54aabdac72e9c7bbd4f8372f1df2d9f0ae tree dfa89d42babe00110bc3c20cc9297c58bd7c8d6c parent 60edb13759096097b7208843dc9b7582a7d14c61 author Mauro Carvalho Chehab Mon, 19 Dec 2005 08:54:11 -0200 committer Mauro Carvalho Chehab Mon, 19 Dec 2005 08:54:11 -0200 [PATCH] V4L/DVB (3189): Fix a broken logic that didn't cover all standards. - Fix a broken logic that didn't cover all standards. - Fix compilation failure with gcc 2.95.3. Signed-off-by: Mauro Carvalho Chehab commit 60edb13759096097b7208843dc9b7582a7d14c61 tree fa3903506d22539ee9fd9703de20bf599040eae5 parent 3338761e6c52a8dee631dcc69129c625801ab132 author Oliver Endriss Mon, 19 Dec 2005 08:54:11 -0200 committer Mauro Carvalho Chehab Mon, 19 Dec 2005 08:54:11 -0200 [PATCH] V4L/DVB (3181): Enable SPDIF output for DVB-S rev 2.3 - Enable SPDIF output for DVB-S rev 2.3. Firmware 2623 or higher required. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 3338761e6c52a8dee631dcc69129c625801ab132 tree cf2fa8ee838402c8fb9414bf22c7d7d00ac594c6 parent f85c657ff1f712abd5207a95fba8a5fcc282ab04 author Ricardo Cerqueira Mon, 19 Dec 2005 08:54:11 -0200 committer Mauro Carvalho Chehab Mon, 19 Dec 2005 08:54:11 -0200 [PATCH] V4L/DVB (3180): Fix tuner 100 definition for hauppauge eeprom - Tuner 100 is the TUNER_PHILIPS_FMD1216ME_MK3, not TUNER_ABSENT. This was causing the tuner module to be skipped, and rendered boards with this value in the eeprom (like the HVR1100) unable to tune Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit f85c657ff1f712abd5207a95fba8a5fcc282ab04 tree d1b1f834b7a4ef96a3efc9dccb8ad08d56f30ada parent 48ea753075aa15699bd5fac26faa08431aaa697b author Jean Delvare Mon, 19 Dec 2005 08:53:59 -0200 committer Mauro Carvalho Chehab Mon, 19 Dec 2005 08:53:59 -0200 [PATCH] V4L/DVB (3188): Fix compilation failure with gcc 2.95.3. - Fix compilation failure with gcc 2.95.3. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 567bd98017d9c9f2ac1c148ddc78c062e8abd398 tree 317ade84394ec112c4e8f851b18fbd7df2c26af8 parent 48ea753075aa15699bd5fac26faa08431aaa697b author Russell King Sat, 17 Dec 2005 15:25:42 +0000 committer Russell King Sat, 17 Dec 2005 15:25:42 +0000 [ARM] Fix sys_sendto and sys_recvfrom 6-arg syscalls Rather than providing more wrappers for 6-arg syscalls, arrange for them to be supported as standard. This just means that we always store the 6th argument on the stack, rather than in the wrappers. This means we eliminate the wrappers for: * sys_futex * sys_arm_fadvise64_64 * sys_mbind * sys_ipc Signed-off-by: Russell King