commit deda498710e190c7922c2634ed630ee64ce86c05 tree 4de8700e84390a50915760ac0da89bd145fed5b7 parent ca98f825ea05edb41346f12408caa30be8a287c6 parent ea86575eaf99a9262a969309d934318028dbfacb author Linus Torvalds Thu, 01 Dec 2005 15:54:00 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:54:00 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit ca98f825ea05edb41346f12408caa30be8a287c6 tree 98826d67758b0bd028a04e16446441adb66f4d66 parent b67c26e4fcfdade157d5bd54085720e71518cccd parent 11849fe67430ba48547e17b25a7831da29863efa author Linus Torvalds Thu, 01 Dec 2005 15:53:33 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:53:33 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit b67c26e4fcfdade157d5bd54085720e71518cccd tree cbfcbf209abc06fc28b6c77a130985e7212879c5 parent c6b79418a4bb0260a92a25f562047d5be7b0e7f4 parent 80b42598eec1627084e225c575201bdd838f5b8f author Linus Torvalds Thu, 01 Dec 2005 15:52:58 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:52:58 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus commit c6b79418a4bb0260a92a25f562047d5be7b0e7f4 tree 558f540614f3cc764f0db81115881f4efdf05b76 parent f327220b1494aa23fd4206ac4778b8aa449a3351 parent f4e401562c11c7ca65592ebd749353cf0b19af7b author Linus Torvalds Thu, 01 Dec 2005 15:52:12 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:52:12 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband commit f327220b1494aa23fd4206ac4778b8aa449a3351 tree b463d2541db1638c7cb8b9ff10a9238fc8a47000 parent 31b3c31bca3b4df975631323d6ee6f49f43f4956 parent ea182d4aefa3a27847d890b1592a608d1180aa45 author Linus Torvalds Thu, 01 Dec 2005 15:49:37 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:49:37 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 31b3c31bca3b4df975631323d6ee6f49f43f4956 tree dc873a16f109971287609c133855ce4d3f323dda parent a72403594ad23bbd2ac0349dd0e537b28862faac author Michael Krufky Thu, 01 Dec 2005 00:52:10 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:49:00 -0800 [PATCH] V4l/dvb: Fix typo, removing incorrect info from CONFIG_BT848_DVB kconfig entry. Fix typo, removing incorrect info from CONFIG_BT848_DVB kconfig entry. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a72403594ad23bbd2ac0349dd0e537b28862faac tree 738a895e1a76ca42c3ae45d472b0b7c191d89c24 parent ab60e303cd3e73a68d5e397be50a1cb35452513c author Mike Isely Thu, 01 Dec 2005 00:52:04 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:49:00 -0800 [PATCH] V4l/dvb: Restore missing tuner definition for Hauppauge tuner type 0x103 Type 0x103 ("TCL MFNM05-4") in the Hauppauge eeprom is a more recent tuner that maps to TUNER_PHILIPS_FM1236_MK3. This had been previously defined but due to some accident the definition got removed. This change restores that definition. Change committed on advice from Hans Verkuil , who thinks he's the one who had accidentally removed it before. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab60e303cd3e73a68d5e397be50a1cb35452513c tree 220530c188a90ad2f8c08d72ed0b7fea423c6a81 parent 3535396d3ac7fc5eeda4526aee34494a479cc628 author Hans Verkuil Thu, 01 Dec 2005 00:51:58 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:59 -0800 [PATCH] V4L/dvb: fix kernel message (print of %s from random pointer) Fix kernel message ( basically printk("%s", random_pointer) ). Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3535396d3ac7fc5eeda4526aee34494a479cc628 tree e9c094adfd999d4085ea53d81d59244e4da58ac9 parent f05cb3239d078f16d082398818dd4e66e645f388 author Mauro Carvalho Chehab Thu, 01 Dec 2005 00:51:57 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:59 -0800 [PATCH] V4L/DVB: SCM update Add v4l/dvb quilt tree to MAINTAINERS file. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f05cb3239d078f16d082398818dd4e66e645f388 tree 63090097a7c8fa6bb79446830dfaefed97536c84 parent 48063a75aff8a572ed167470564309697cf0e8cc author Carlos Silva Thu, 01 Dec 2005 00:51:56 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:59 -0800 [PATCH] DVB: BUDGET CI card depends on STV0297 demodulator. BUDGET_CI card depends on STV0297 demodulator. Signed-off-by: Johannes Stezenbach Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48063a75aff8a572ed167470564309697cf0e8cc tree d7ec09f3f861c79ffd00233ff657562d25019f36 parent 1130ca45c719fe788fa544a54a82ea53ef5ea87a author Denis Vlasenko Thu, 01 Dec 2005 00:51:55 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:59 -0800 [PATCH] DVB: Fixes ifs in ves1820 set symbolrate(). Remove stray semicolons after if (foo); in ves1820_set_symbolrate(). Signed-off-by: Denis Vlasenko Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1130ca45c719fe788fa544a54a82ea53ef5ea87a tree 423a0eb692c0e14a8b1c6462a8dfdfc402e93753 parent 9b9225f0f002c39f340da2ed1e7efec6885ca312 author Ralph Metzler Thu, 01 Dec 2005 00:51:54 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:59 -0800 [PATCH] DVB: Fix locking to prevent Oops on SMP systems Fix locking to prevent Oops on SMP systems when starting/stopping dvb network interfaces. Signed-off-by: Ralph Metzler Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b9225f0f002c39f340da2ed1e7efec6885ca312 tree 9003bb38a7b5f15c91cb2471a538519ee44d5256 parent 15ac8e663b354ed98d43d149f718f6f15ab732ac author Steven Toth Thu, 01 Dec 2005 00:51:53 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:59 -0800 [PATCH] DVB: Update Steve's email address. Update Steve's email address. Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15ac8e663b354ed98d43d149f718f6f15ab732ac tree 86ecc54df2f2337cda17d4140b993bbdfb3a08ad parent 18e55eea0104927feedfe81de1adf5e46a7ad1f3 author Adrian Bunk Thu, 01 Dec 2005 00:51:53 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:59 -0800 [PATCH] DVB: Small cleanups and CodeStyle fixes - Small cleanups: - make needlessly global functions static - every file should #include the headers containing the prototypes for it's global functions Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18e55eea0104927feedfe81de1adf5e46a7ad1f3 tree 362ac0084abee7b1f3934721738c9da781469417 parent 363bbf42da23898ab48dc227cca9d80b50b481eb author Tim Schmielau Thu, 01 Dec 2005 00:51:51 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:59 -0800 [PATCH] DVB: Include fixes for 2.6.15-rc1 for removing sched.h from module.h Include fixes for 2.6.15-rc1 for removing sched.h from module.h. Signed-off-by: Tim Schmielau Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 363bbf42da23898ab48dc227cca9d80b50b481eb tree ee6463de2fb4caa70924ed3dd33015df4f266060 parent ded928468407c8e08dcb6aedb91aaa97b80d5752 author Patrick Boettcher Thu, 01 Dec 2005 00:51:51 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:59 -0800 [PATCH] DVB: Fixed incorrect usage at the private state of the dvb-usb-devices Fixed mistake of an incorrect usage of pid_filter-callbacks inside the private state of the dvb-usb-devices Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ded928468407c8e08dcb6aedb91aaa97b80d5752 tree 2b85f26bc526939697f3f5192e3ea4385577bdd7 parent 69459f3d2fb9eea370535ceba91dd8c9df3d94bc author Andrew de Quincey Thu, 01 Dec 2005 00:51:49 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:58 -0800 [PATCH] DVB: Fix locking problems and code cleanup Fix locking problems and code cleanup Signed-off-by: Andrew de Quincey Signed-off-by: Johannes Stezenbach Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69459f3d2fb9eea370535ceba91dd8c9df3d94bc tree 2bc018e8e5d1943d620be81a253a90817e5c0605 parent f95006f89576cac504323daa53157013bf099fc9 author Oliver Endriss Thu, 01 Dec 2005 00:51:48 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:58 -0800 [PATCH] DVB: Fixed DiSEqC timing for saa7146-based budget cards Fixed DiSEqC timing for saa7146-based budget cards (speed-up ioctls using SAA7146_I2C_SHORT_DELAY) Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f95006f89576cac504323daa53157013bf099fc9 tree 1ee888856e45f1f6c9546fae5e64341674b9d320 parent 0fe22865ddee524017a1012528b0e15475acc942 author Hans Verkuil Thu, 01 Dec 2005 00:51:42 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:58 -0800 [PATCH] V4L: Add workaround for Hauppauge PVR150 with certain NTSC tuner models Add workaround for Hauppauge PVR150 hardware problem with tuner models 85, 99 and 112 (model numbers as reported by tveeprom). The audio standard autodetection does not always work correctly for these models. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fe22865ddee524017a1012528b0e15475acc942 tree d750dc1aec8f85b0ece7c21e62a93630dcb24c6d parent bbf7871e1cd58b89f77b1152f457250c6e94b614 author Steven Toth Thu, 01 Dec 2005 00:51:41 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:58 -0800 [PATCH] V4L: Fixed eeprom handling for cx88 and added Nova-T PCI model 90003 - Fixed code handling for eeprom on cx88 boards. - Hauppauge released a new version of the Nova-T-PCI (9002) a few months ago with a different (compatible) tuner (but lacking RF passthru). The official model# is 90003. All features are working. - Adding entry to the known model list after testing. Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbf7871e1cd58b89f77b1152f457250c6e94b614 tree 77ae1f89a8e47701629d1cb6bbd49ac377b254c6 parent fd1eab73d50258b4c622b8dc23d896abd5cff2e6 author Michael H. Schimek Thu, 01 Dec 2005 00:51:40 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:58 -0800 [PATCH] V4L: Fix bttv ioctls VIDIOC_ENUMINPUT, VIDIOCGTUNER, VIDIOC_QUERYCAP Fixed bttv ioctls VIDIOC_ENUMINPUT, VIDIOCGTUNER, VIDIOC_QUERYCAP. Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Michael H. Schimek Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd1eab73d50258b4c622b8dc23d896abd5cff2e6 tree e770702e5119803503f6c13dfd071169cbd3f308 parent 1bcd2a36711e6a72802a92a4e3fcef9d0c59dc3f author Reimar Doeffinger Thu, 01 Dec 2005 00:51:39 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:58 -0800 [PATCH] V4L: Fix crash when not compiled as module Fix crash when not compiled as module. Signed-off-by: Reimar Doeffinger Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bcd2a36711e6a72802a92a4e3fcef9d0c59dc3f tree 44065889a34c72acd6581132e759466cf3f6c345 parent 13c72805b3d922d85d5c470e851c93e8f8c076d8 author Dwaine Garden Thu, 01 Dec 2005 00:51:37 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:58 -0800 [PATCH] V4L: Write cached value to correct register for SECAM Write cached value to correct register for SECAM. Signed-off-by: Dwaine Garden Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13c72805b3d922d85d5c470e851c93e8f8c076d8 tree f8ceb2a43f52b1cdf8da7ab429963dca16a2482a parent 943a49027b6d9829b737e6da3d72b867a7a6f832 author Michael H. Schimek Thu, 01 Dec 2005 00:51:37 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:58 -0800 [PATCH] V4L: Fixes Bttv raw format to fix VIDIOCSPICT ioctl Fixes Bttv raw format to fix VIDIOCSPICT ioctl. Signed-off-by: Michael H. Schimek Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 943a49027b6d9829b737e6da3d72b867a7a6f832 tree 14b6fa8f407b760ca9dcb14498498bcf48f9786e parent 769e24382dd47434dfda681f360868c4acd8b6e2 author Adrian Bunk Thu, 01 Dec 2005 00:51:35 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:57 -0800 [PATCH] V4L: Makes needlessly global code static This patch makes needlessly global code static. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 769e24382dd47434dfda681f360868c4acd8b6e2 tree 1be728dd2f1a7f523e3de5f3f39b97a4b9905dbe parent 6f502b8a7858ecfa7d2a0762f7663b8b3d0808fc author Mauro Carvalho Chehab Thu, 01 Dec 2005 00:51:35 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:57 -0800 [PATCH] V4L: Some funcions now static and I2C hw code for IR - Some funcions are now declared as static - Added a I2C code for InfraRed. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f502b8a7858ecfa7d2a0762f7663b8b3d0808fc tree b6f6ef7e9918324136eabb506c37f7b91bd647b2 parent c87c948ebd75525df4d67dd5b40e6ea81859cc17 author Mauro Carvalho Chehab Thu, 01 Dec 2005 00:51:34 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:57 -0800 [PATCH] V4L: Enables audio DMA setting on cx88 chips, even when dma not in use - Enabled audio DMA transfer code even when DMA not in use to solve a problem on some broken cx88 chips. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c87c948ebd75525df4d67dd5b40e6ea81859cc17 tree c84d2b6b707407e3468a94068047c105f3e347bd parent 50ab5edc973c979e8f620e09d20b96761d271894 author Michael H. Schimek Thu, 01 Dec 2005 00:51:33 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:57 -0800 [PATCH] V4L: Bttv bytes per line fix bttv bytes per line fix. Signed-off-by: Michael H. Schimek Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50ab5edc973c979e8f620e09d20b96761d271894 tree 7be7c4416bb650c1c1c0d5845c2f0369e9956b35 parent 3b86b9999deb04bbfbb20e6b6fe1119a4bf0ff34 author Nickolay V. Shmyrev Thu, 01 Dec 2005 00:51:32 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:57 -0800 [PATCH] V4L: Fix read() bugs in bttv driver Fix read() bugs in bttv driver. Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Michael H. Schimek Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b86b9999deb04bbfbb20e6b6fe1119a4bf0ff34 tree 0f1ab93d183ef64ae0ba9fe29dcaa03a0b8a55ef parent 53a7338af60689817e81114d42cfa2ab4bb95516 author Mauro Carvalho Chehab Thu, 01 Dec 2005 00:51:31 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:57 -0800 [PATCH] V4L: Removed audio DMA enabling from cx88-core - Removed code that enables audio DMA transfers at cx88-core. - This stuff should be at cx88-alsa when ready. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53a7338af60689817e81114d42cfa2ab4bb95516 tree 7ad9cf7f0c048fc7c43c5a194ddcc020a88e8a71 parent 3ca0ea980697d3b3c3d5c13ba7e525ed6c434756 author Ian Pickworth Thu, 01 Dec 2005 00:51:28 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:57 -0800 [PATCH] V4L: Fixes nicam sound - Resolved problem of sporadic buzz after setting Nicam stereo - improved setting audio standard with dma reset - cleaned up comments format - more sensitive Nicam detection Signed-off-by: Ian Pickworth Signed-off-by: Michal Pytasz Signed-off-by: Marcin Rudowski Signed-off-by: Torsten Seeboth Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ca0ea980697d3b3c3d5c13ba7e525ed6c434756 tree db5d423db74e88ce836588bb77ab8ae77649b5f8 parent 759324c3c4b8d63203d7ea41b56553330bc0df06 author Steven Toth Thu, 01 Dec 2005 00:51:27 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:57 -0800 [PATCH] V4L: tveeprom MAC address parsing/cleanup - Added a mac address field to the tveeprom structure. - allow callers to query the MAC address. - removed some redundant eeprom parsing code in cx88-cards.c (specific to Hauppauge DVB products) Instead, placed calls directly to the single eeprom parsing function in tveeprom.c Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 759324c3c4b8d63203d7ea41b56553330bc0df06 tree 878ff3bcfc4bba8fdbdc930175b5466e6598a6f0 parent 97cb445df6c6cb81e4f06ee159331f15bf5c4513 author Steven Toth Thu, 01 Dec 2005 00:51:26 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:56 -0800 [PATCH] V4: Include comments for DVB models and includes missing ones Include comments for DVB models and includes missing ones Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97cb445df6c6cb81e4f06ee159331f15bf5c4513 tree 3f523c672b7220d79c0ca477458f34898d135f47 parent f5b974cb16dd95d1ae0424f68f74550dbd793a33 author Luiz Capitulino Thu, 01 Dec 2005 00:51:24 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:56 -0800 [PATCH] V4L: Fixes warning at bttv-driver.c Fixes warning at bttv-driver.c Signed-off-by: Luiz Capitulino Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5b974cb16dd95d1ae0424f68f74550dbd793a33 tree 214fa2dc0ac32d84c56fe4a74b613eae6fbf68a0 parent 938606b02b3d7b587777e5b1e44f4196903250ca author Ricardo Cerqueira Thu, 01 Dec 2005 00:51:20 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:56 -0800 [PATCH] V4L: Fix hotplugging issues with saa7134 - Fixed issue with hotplugging and DMA sound (sound was lost when replugging a card) - Added notifiers to main saa7134 module to let the sound sub-modules know when a card has been inserted or removed Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 938606b02b3d7b587777e5b1e44f4196903250ca tree 136b2a3b770e04959a2979e5bb47ee3dd819ec7c parent db1d1d57e97700b4131fe80556dc6ef976d534c4 author Sigmund Augdal Helberg Thu, 01 Dec 2005 00:51:19 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:56 -0800 [PATCH] V4L: Fixes maximum number of VBI devices - Increases the minor number limitation for vbi devices from 223 to 255. This is in agreement with the minor number allocation specified in Documentation/devices.txt. - Without this patch it is not possible to use more than 5 Hauppauge WinTV-PVR 350 cards since each of these allocate 3 vbi devices. Signed-of-by: Sigmund Augdal Helberg Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db1d1d57e97700b4131fe80556dc6ef976d534c4 tree abdc78339b1c1bd4e37cb496c68424d9d7d98592 parent 5c72c343719a8c5dba675cd1b27b63c06bfe23d1 author David Howells Thu, 01 Dec 2005 00:51:18 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:56 -0800 [PATCH] Keys: Fix permissions check for update vs add Permit add_key() to once again update a matching key rather than adding a new one if a matching key already exists in the target keyring. This bug causes add_key() to always add a new key, displacing the old from the target keyring. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c72c343719a8c5dba675cd1b27b63c06bfe23d1 tree bd5f3220aef43a44274fe633f69c50de0233aae4 parent 42ea0d037860690dde07a015d3473a17da35f74a author Eugene Surovegin Thu, 01 Dec 2005 00:51:17 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:56 -0800 [PATCH] ppc32: fix treeboot image entrypoint Correctly specify treeboot based image entrypoint. Currently makefile uses $(ENTRYPOINT) which isn't defined anywhere. Each board port sets entrypoint-$(CONFIG_BOARD_NAME) instead. Without this patch I cannot boot Ocotea (PPC440GX eval board) anymore. I was getting random "OS panic" errors from OpenBIOS for a while, but with current kernel I get them all the time (probably because image became bigger). Signed-off-by: Eugene Surovegin Acked-by: Tom Rini Cc: Matt Porter Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42ea0d037860690dde07a015d3473a17da35f74a tree 02f10934ab3022259880f3118db2f60ce1c1fa38 parent 00c1bd54d8c7b6210530cdbb3508125a0bf4a32b author Vitaly Bordug Thu, 01 Dec 2005 00:51:15 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:48:56 -0800 [PATCH] ppc32: Fix incorrect PCI frequency value The time to wait after deasserting PCI_RST has been counted with incorrect value - this patch fixes the issue. Signed-off-by: Vitaly Bordug Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00c1bd54d8c7b6210530cdbb3508125a0bf4a32b tree df4268371b3f1f00cce53247a7871d70e5cf4955 parent 5666c0947ede0432ba5148570aa66ffb9febff5b parent 220ec706645ecf13ee3a87046d17316303905698 author Linus Torvalds Thu, 01 Dec 2005 15:45:30 -0800 committer Linus Torvalds Thu, 01 Dec 2005 15:45:30 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 commit ea86575eaf99a9262a969309d934318028dbfacb tree d2d0418160460265ba61defa81bfbd870dce813e parent 2a43c4af3fa2e701008d51c28365e26fccf9cbb0 author Thomas Graf Thu, 01 Dec 2005 14:30:00 -0800 committer David S. Miller Thu, 01 Dec 2005 14:30:00 -0800 [NETLINK]: Fix processing of fib_lookup netlink messages The receive path for fib_lookup netlink messages is lacking sanity checks for header and payload and is thus vulnerable to malformed netlink messages causing illegal memory references. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 2a43c4af3fa2e701008d51c28365e26fccf9cbb0 tree 4018c6b43c81875c424502ca1b7bc464a22064c0 parent 73f306024c15bd12e59677d6eaf43ecced614f04 author Phil Oester Thu, 01 Dec 2005 14:29:24 -0800 committer David S. Miller Thu, 01 Dec 2005 14:29:24 -0800 [NETFILTER]: Fix recent match jiffies wrap mismatches Around jiffies wrap time (i.e. within first 5 mins after boot), recent match rules which contain both --seconds and --hitcount arguments experience false matches. This is because the last_pkts array is filled with zeros on creation, and when comparing 'now' to 0 (+ --seconds argument), time_before_eq thinks it has found a hit. Below patch adds a break if the packet value is zero. This has the unfortunate side effect of causing mismatches if a packet was received when jiffies really was equal to zero. The odds of that happening are slim compared to the problems caused by not adding the break however. Plus, the author used this same method just below, so it is "good enough". This fixes netfilter bugs #383 and #395. Signed-off-by: Phil Oester Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 73f306024c15bd12e59677d6eaf43ecced614f04 tree 88d89bf7d54d51df8bd229ed9384e42f4064245a parent 5666c0947ede0432ba5148570aa66ffb9febff5b author Jozsef Kadlecsik Thu, 01 Dec 2005 14:28:58 -0800 committer David S. Miller Thu, 01 Dec 2005 14:28:58 -0800 [NETFILTER]: Ignore ACKs ACKs on half open connections in TCP conntrack Mounting NFS file systems after a (warm) reboot could take a long time if firewalling and connection tracking was enabled. The reason is that the NFS clients tends to use the same ports (800 and counting down). Now on reboot, the server would still have a TCB for an existing TCP connection client:800 -> server:2049. The client sends a SYN from port 800 to server:2049, which elicits an ACK from the server. The firewall on the client drops the ACK because (from its point of view) the connection is still in half-open state, and it expects to see a SYNACK. The client will eventually time out after several minutes. The following patch corrects this, by accepting ACKs on half open connections as well. Signed-off-by: Jozsef Kadlecsik Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 11849fe67430ba48547e17b25a7831da29863efa tree 0f10c7ff4c70b3242f0650c3d6c2d0fe461f2836 parent 08af295ba491123d067400228d887ca574aceecd author Arthur Othieno Thu, 01 Dec 2005 20:58:01 +0000 committer Russell King Thu, 01 Dec 2005 20:58:01 +0000 [ARM] sema_count() removal sema_count() defined only for ARM but not used anywhere. Signed-off-by: Arthur Othieno Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 08af295ba491123d067400228d887ca574aceecd tree 1284425fd279cf007aaf824745a4c0043a985493 parent a35d6c91b8f061da9b76c8c0102d1e1e6bc6f47b author Richard Purdie Thu, 01 Dec 2005 15:52:47 +0000 committer Russell King Thu, 01 Dec 2005 15:52:47 +0000 [ARM] 3188/1: Add missing i2c dependency for Akita Patch from Richard Purdie Akita requires inbuilt kernel i2c support for its GPIOs. Add this requirement to Kconfig and update the defconfig to match. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit a35d6c91b8f061da9b76c8c0102d1e1e6bc6f47b tree 53169b760b0f7c2fc3be5b3e2e29702a212aba3d parent 00b4c90787298349b799069360ced9ca843153dc author Jeff Hansen Thu, 01 Dec 2005 15:50:35 +0000 committer Russell King Thu, 01 Dec 2005 15:50:35 +0000 [ARM] Fix IXDP425 setup bug There is a typo in the ARM IXDP425 setup definition that mistakenly tries to use UART1's IRQ for UART2's traffic. Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 00b4c90787298349b799069360ced9ca843153dc tree cb135bdb9a408ec771c862caae5d86a2d6754861 parent df2f5e721ed36e21da27e1f415c71ba0e20f31b5 author Russell King Thu, 01 Dec 2005 15:47:24 +0000 committer Russell King Thu, 01 Dec 2005 15:47:24 +0000 [ARM SMP] Use event instructions for spinlocks ARMv6K CPUs have SEV (send event) and WFE (wait for event) instructions which allow the CPU clock to be suspended until another CPU issues a SEV, rather than spinning on the lock wasting power. Make use of these instructions. Note that WFE does not wait if an event has been sent since the last WFE cleared the event status, so although it may look racy, the instruction implementation ensures that these are dealt with. Signed-off-by: Russell King commit 80b42598eec1627084e225c575201bdd838f5b8f tree b15e482fa4748abbd0421cd9708127e93ce82817 parent 85b05496024fd913da2c1fbea711ebcdfd40c2f3 author Ralf Baechle Thu, 01 Dec 2005 11:05:19 +0000 committer Ralf Baechle Thu, 01 Dec 2005 11:05:19 +0000 [MIPS] Update defconfigs to reflect Kconfig changes. Signed-off-by: Ralf Baechle commit 85b05496024fd913da2c1fbea711ebcdfd40c2f3 tree 94910c9702bb37a92418ec8b1ae89a82f27d7a85 parent 04a7052c8399edc95b5e120c980823ccaade6aaf author Ralf Baechle Wed, 30 Nov 2005 17:21:06 +0000 committer Ralf Baechle Thu, 01 Dec 2005 11:05:18 +0000 [MIPS] Avoid duplicate do_syscall_trace calls on return from sigreturn. Signed-off-by: Ralf Baechle commit 04a7052c8399edc95b5e120c980823ccaade6aaf tree 230e75476b3d1fae60bfaf98d4e407d65b0be114 parent ecd5a739048b4d94e4ae3545196eb752d6776c97 author Ralf Baechle Wed, 30 Nov 2005 16:24:57 +0000 committer Ralf Baechle Thu, 01 Dec 2005 11:05:17 +0000 [MIPS] Fix register handling in syscalls when debugging. Signed-off-by: Ralf Baechle commit ecd5a739048b4d94e4ae3545196eb752d6776c97 tree 11f2bc0803a06bf4ae0b93814454eb742f8eaaa8 parent dea91002d45e4f0fe83768703288e1cde917371c author Ralf Baechle Tue, 29 Nov 2005 17:03:02 +0000 committer Ralf Baechle Thu, 01 Dec 2005 11:05:16 +0000 [MIPS] Alchemy: Set board type on initialization. From Sergei Shtylylov . Signed-off-by: Ralf Baechle commit dea91002d45e4f0fe83768703288e1cde917371c tree 310ddf176806bfb3e4a74774c1c2cbd255083ef7 parent edcb98d1db7d0320d7b1920c05a4f1cafe7cb798 author Ralf Baechle Tue, 29 Nov 2005 16:01:32 +0000 committer Ralf Baechle Thu, 01 Dec 2005 11:05:16 +0000 [MIPS] Alchemy: Fix BCSR accesses. Fixes BCSR accesses in the board setup/reset code. The registers are actually 16-bit, and their addresses are different between DBAu1550 and other DBAu1xx0 boards. From Sergei Shtylylov . Signed-off-by: Ralf Baechle commit edcb98d1db7d0320d7b1920c05a4f1cafe7cb798 tree cd148f10f348ab62a47a2c1fdbc8aaa10d0d7032 parent fe3d72858c34a464976c6f8076971e2862d5c3b8 author Ralf Baechle Tue, 29 Nov 2005 13:01:01 +0000 committer Ralf Baechle Thu, 01 Dec 2005 11:05:15 +0000 [MIPS] Fix return path of sysmips(MIPS_ATOMIC_SET, ...) The way we were doing things does no longer work on 2.6. Signed-off-by: Ralf Baechle commit fe3d72858c34a464976c6f8076971e2862d5c3b8 tree 5903ce0e8eaf69eb71ec29929bd03877e094ecf4 parent e76beeebff09b6a5eb338f306349ddc451a7804d author Ralf Baechle Mon, 28 Nov 2005 13:15:08 +0000 committer Ralf Baechle Thu, 01 Dec 2005 11:05:15 +0000 [MIPS] Qemu: Accept kernel command line passed by the Emulator. From Daniel Jacobowitz . Signed-off-by: Ralf Baechle commit e76beeebff09b6a5eb338f306349ddc451a7804d tree abea0748975eba97973ae7e423640a1b51c6e389 parent 56ebd51bae72c2e47c83f6eacf258479d5658ec8 author Ralf Baechle Mon, 28 Nov 2005 13:12:51 +0000 committer Ralf Baechle Thu, 01 Dec 2005 11:05:15 +0000 [MIPS] Qemu: Qemu is emulating a 1193.182kHz i8254 PIC. From Daniel Jacobowitz . Signed-off-by: Ralf Baechle commit 56ebd51bae72c2e47c83f6eacf258479d5658ec8 tree eb39e5ee383815c0185b910523d5470088f93494 parent b6c3539bdd6d766cffea76698c85ebb92bf3fb12 author Daniel Jacobowitz Sat, 26 Nov 2005 22:34:41 -0500 committer Ralf Baechle Thu, 01 Dec 2005 11:05:14 +0000 [MIPS] Generate SIGILL again The rdhwr emulation accidentally swallowed the SIGILL from most other illegal instructions. Make sure to return -EFAULT by default. Signed-off-by: Daniel Jacobowitz Signed-off-by: Ralf Baechle commit b6c3539bdd6d766cffea76698c85ebb92bf3fb12 tree af8ef2310e5f6218c91c167cf5e3b2ca88f1e393 parent d981733aaf970e4537bb8dee9422ee775d92e5ae author Ralf Baechle Fri, 25 Nov 2005 11:35:40 +0000 committer Ralf Baechle Thu, 01 Dec 2005 11:05:14 +0000 [MIPS] Kconfig: Include init/Kconfig after we've set 32BIT / 64BIT. Signed-off-by: Ralf Baechle commit d981733aaf970e4537bb8dee9422ee775d92e5ae tree 537236d2937d4d8a1f2c276cd026c774e656ea5c parent 8b36612a23fda542fab5f0c6c26e15e2178e3d0e author Ralf Baechle Wed, 23 Nov 2005 13:49:09 +0000 committer Ralf Baechle Thu, 01 Dec 2005 11:05:13 +0000 [MIPS] Use reset_page_mapcount to initialize empty_zero_page usage counter. Signed-off-by: Ralf Baechle commit 8b36612a23fda542fab5f0c6c26e15e2178e3d0e tree b450d768b69bb89cecccc0321eade2d37174c8df parent 380b92537c23422b277ff66eb7086a092dbb75cb author Ralf Baechle Tue, 22 Nov 2005 17:53:59 +0000 committer Ralf Baechle Thu, 01 Dec 2005 11:05:12 +0000 [MIPS] R10000 and R12000 need to set MIPS_CPU_4K_CACHE ... ... because they have R4000-style caches. Signed-off-by: Ralf Baechle commit 380b92537c23422b277ff66eb7086a092dbb75cb tree eff37b17a9f86a66322785d1eb237afa7d1f002d parent 702a96a62b2a37025a752409b0dc08d8473096b1 author Ralf Baechle Sat, 19 Nov 2005 21:51:56 +0000 committer Ralf Baechle Thu, 01 Dec 2005 11:05:11 +0000 [MIPS] JMR3927: Declare puts function. Signed-off-by: Ralf Baechle commit 702a96a62b2a37025a752409b0dc08d8473096b1 tree c8be650426703bd8881969493c6d2523a4444bfe parent 5666c0947ede0432ba5148570aa66ffb9febff5b author Sergei Shtylylov Fri, 18 Nov 2005 22:20:31 +0300 committer Ralf Baechle Thu, 01 Dec 2005 11:05:10 +0000 [MIPS] JMR3927 fixes. o Check if IRQ is disabled or in progress before reenabling interrupts in jmr3927_irq_end.. o s/spinlock_irqsave/spin_lock_irqsave/ o s/spinlock_irqrestore/spin_unlock_irqrestore/ o Flush write buffer after setting IRQ mask o In 2.6 jmr3927_ioc_interrupt interrupt handlers return irqreturn_t Signed-off-by: Sergei Shtylyov Signed-off-by: Ralf Baechle commit ea182d4aefa3a27847d890b1592a608d1180aa45 tree a58cfb27654e5ada4ade104a0bb0e6a01b0db4a3 parent ab80882bf339c5954a69bb0603df0113b17d384f author Jeff Garzik Thu, 01 Dec 2005 04:31:32 -0500 committer Jeff Garzik Thu, 01 Dec 2005 04:31:32 -0500 [netdrvr skge] fix typo, fix build commit ab80882bf339c5954a69bb0603df0113b17d384f tree 7e8192acfd1ab3627357b4d32bdb8584fe8d0612 parent 1d97f384486a697ed227ef4609a26f18a8ea9a11 author Komuro Thu, 01 Dec 2005 02:37:17 -0500 committer Jeff Garzik Thu, 01 Dec 2005 02:37:17 -0500 [netdrvr fmvj18x_cs] fix multicast bug * use set_rx_mode to (re)initialize the multicast table. * MC_FILTERBREAK is 64 (= 8 * 8bit) * remove local_info_t.mc_filter commit 1d97f384486a697ed227ef4609a26f18a8ea9a11 tree 930213b1fb4f810c0e0ab3cfcfd3feeb2880a1fe parent 1096e87174f925bb817a41386ee70573b2a7d6ff author Matthieu CASTET Thu, 01 Dec 2005 02:35:26 -0500 committer Jeff Garzik Thu, 01 Dec 2005 02:35:26 -0500 [wireless airo] reset card in init without this patch after an rmmod, modprobe the card won't work anymore until the next reboot. This patch seem safe to apply for all cards as the bsd driver already do that. I had to add a timeout because strange things happen (issuecommand will fail) if the card is already reseted (after a reboot). PS : it seems there are missing reset when leaving monitor mode... Signed-off-by: Matthieu CASTET commit 1096e87174f925bb817a41386ee70573b2a7d6ff tree e095794ba061aa573bbd975a035e20abcaa857c8 parent c08ad1e304061dbd6ef7545d8f2db530b43c0fbd author Stephen Hemminger Mon, 28 Nov 2005 11:38:50 -0800 committer Jeff Garzik Thu, 01 Dec 2005 02:28:56 -0500 [PATCH] skge: handle VLAN checksum correctly on yukon rev 0 If using UDP over VLAN, with the skge driver there is a possibility of generating an incorrect checksum. This is a unlikely occurrence because it is only an issue on Yukon revision 0, and that revision doesn't seem to exist on any current hardware (probably early prototype). Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit c08ad1e304061dbd6ef7545d8f2db530b43c0fbd tree ce55c1ed1d7aabe5dd691a9270de9f63a4ae3738 parent ee7ebdf40260c6c5586f20cda5d253bc988e7baa author Pavel Roskin Tue, 29 Nov 2005 02:59:27 -0500 committer Jeff Garzik Thu, 01 Dec 2005 02:28:56 -0500 [PATCH] orinoco: fix setting power management parameters Power management parameters could not be set by iwconfig due to incorrect error handling. Signed-off-by: Pavel Roskin Signed-off-by: Jeff Garzik commit ee7ebdf40260c6c5586f20cda5d253bc988e7baa tree 23ab0c888dd77e6c2d0a141f712e1570060bd48d parent 23c2a7b5dea983c7cee2813817409552f9714e95 author Ralf Baechle Tue, 22 Nov 2005 00:19:44 +0000 committer Jeff Garzik Thu, 01 Dec 2005 02:26:46 -0500 [PATCH] jazzsonic: Fix platform device code Use platform_driver_unregister not driver_unregister to unregister a struct platform_driver. Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 23c2a7b5dea983c7cee2813817409552f9714e95 tree f1e7fb2a5aa8e8a0d1b067a440df26ea88c48df7 parent 56344d822efb25e66df87c5ee81aab8accf4d706 author Ralf Baechle Tue, 22 Nov 2005 00:16:51 +0000 committer Jeff Garzik Thu, 01 Dec 2005 02:26:46 -0500 [PATCH] jazzsonic: Fix build error. jazz_sonnic_device -> jazz_sonic_device Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 56344d822efb25e66df87c5ee81aab8accf4d706 tree a01934f22c167620567593f4f381b1b6266ce5b8 parent 8169bd919146f468942f40c3e708f9ada74a30a4 author Ralf Baechle Mon, 21 Nov 2005 21:05:02 +0000 committer Jeff Garzik Thu, 01 Dec 2005 02:26:45 -0500 [PATCH] mipsnet: Fix Copyright notice. Sorry, no sekr1t mips c0dez ;-) Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit 8169bd919146f468942f40c3e708f9ada74a30a4 tree 44123c0d02b164bac1da83d93661ad3727c4712f parent be0df20cb5ffd36ced9393d004e473d5c531b5da author Eugene Surovegin Thu, 24 Nov 2005 14:48:40 -0800 committer Jeff Garzik Thu, 01 Dec 2005 02:23:35 -0500 [PATCH] ibm_emac: fix graceful stop timeout handling This patch fixes graceful stop timeout handling in PPC4xx EMAC driver. Currently, when we stop TX/RX channels we just do some number of loops without relying on actual spent time. This has finally bitten me on one of our systems (heavy network traffic during start up, RX channel is stopped several times to configure multicast list). Graceful channel stop can take up to 1 frame time, so I've added device specific timeout counter which depends on current link speed and calls to udelay() to really wait required amount of time before giving up. Signed-off-by: Eugene Surovegin Signed-off-by: Jeff Garzik commit be0df20cb5ffd36ced9393d004e473d5c531b5da tree e674aff176695c0b02f5bff7db9d9f7da0c36184 parent 4f4c81504284c0ab66fc6d773dfb3b54aca02427 author shemminger@osdl.org Wed, 23 Nov 2005 22:00:51 -0800 committer Jeff Garzik Thu, 01 Dec 2005 02:22:03 -0500 [PATCH] sk98lin: avoid message confusion with skge Avoid possible confusion between skge and sk98lin driver by tagging messages properly. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 4f4c81504284c0ab66fc6d773dfb3b54aca02427 tree 88608faa793265891aed27d42236efaeb7e4f64b parent 596f86a8d8a70005728944143f08fe5414443355 author shemminger@osdl.org Wed, 23 Nov 2005 22:00:50 -0800 committer Jeff Garzik Thu, 01 Dec 2005 02:22:03 -0500 [PATCH] sk98lin: add permanent address support Add permanent address and link status support via ethtool. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 596f86a8d8a70005728944143f08fe5414443355 tree 4d03416456411b74fbdcdbf944d81b37f8552496 parent a174fd88d2b73c1933ea24ed533354d618c7d089 author shemminger@osdl.org Wed, 23 Nov 2005 22:00:49 -0800 committer Jeff Garzik Thu, 01 Dec 2005 02:22:03 -0500 [PATCH] sk98lin: fix checksumming code Remove code from sk98lin that does it's own checksum validation. This code is incorrect when dealing with nested protocols like VLAN's, and it is better to use regular receive code path to handle hardware checksum. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a174fd88d2b73c1933ea24ed533354d618c7d089 tree 63adc36cb31653534dd2c751d7b6261317e60676 parent d5366d9e24d1e864e48e1705c9b7c21cfc0e9cea author Jesse Brandeburg Tue, 29 Nov 2005 19:23:59 -0800 committer Jeff Garzik Thu, 01 Dec 2005 02:10:11 -0500 [PATCH] e1000: fix for dhcp issue Parse outgoing packets in e1000_transfer_dhcp_info as raw packet even if protocol bits are set. pump, for instance causes kernel panic on some systems, if parsed via udp header. Thanks to Derrell Lipman for reporting and testing. Signed-off-by: Jesse Brandeburg Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit d5366d9e24d1e864e48e1705c9b7c21cfc0e9cea tree d84dcb5b6d0c1c410d93c289f8292ba6993eeecb parent 5666c0947ede0432ba5148570aa66ffb9febff5b parent 981d9c176dacf397d267215d44a4060c28663480 author Jeff Garzik Thu, 01 Dec 2005 02:08:27 -0500 committer Jeff Garzik Thu, 01 Dec 2005 02:08:27 -0500 Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 commit 220ec706645ecf13ee3a87046d17316303905698 tree a73d9f022541df9d9eb1e3bb20cf7ed67b3cc591 parent 16071a073d44ef3ca3f79d0b49371a79464d9ac0 parent 1cbf4c563c0eaaf11c552a88b374e213181c6ddd author Len Brown Thu, 01 Dec 2005 01:42:17 -0500 committer Len Brown Thu, 01 Dec 2005 01:42:17 -0500 Pull 3410 into release branch commit 16071a073d44ef3ca3f79d0b49371a79464d9ac0 tree 26fc25620f3e2b67ebb37c4057dfae46bbf02666 parent b7639dafb4e175ddd637425da5ff65f03e08028e parent cd8e2b48daee891011a4f21e2c62b210d24dcc9e author Len Brown Thu, 01 Dec 2005 01:39:55 -0500 committer Len Brown Thu, 01 Dec 2005 01:39:55 -0500 Pull 5452 into release branch commit b7639dafb4e175ddd637425da5ff65f03e08028e tree 2db15153df1b09b9320a0357696040f59bcebe50 parent c8734a9663806b7ebd3b5e33bae65a60ff6553bd parent 59d399d357a7705568f424c6e861ee8657f7f655 author Len Brown Thu, 01 Dec 2005 01:39:41 -0500 committer Len Brown Thu, 01 Dec 2005 01:39:41 -0500 Pull 5571 into release branch commit cd8e2b48daee891011a4f21e2c62b210d24dcc9e tree 8e02739b3c56ca19f8534ebc238b08619a4a40ac parent d2149b542382bfc206cb28485108f6470c979566 author Venkatesh Pallipadi Fri, 21 Oct 2005 19:22:00 -0400 committer Len Brown Wed, 30 Nov 2005 23:28:50 -0500 [ACPI] fix 2.6.13 boot hang regression on HT box w/ broken BIOS http://bugzilla.kernel.org/show_bug.cgi?id=5452 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 59d399d357a7705568f424c6e861ee8657f7f655 tree 642af97ec5c14243744a76c2744b785d259f3594 parent d2149b542382bfc206cb28485108f6470c979566 author Thomas Renninger Tue, 08 Nov 2005 05:27:00 -0500 committer Len Brown Wed, 30 Nov 2005 23:03:08 -0500 [ACPI] Fix Null pointer deref in video/lcd/brightness http://bugzilla.kernel.org/show_bug.cgi?id=5571 Signed-off-by: Thomas Renninger Signed-off-by: Nishanth Aravamudan Signed-off-by: Yu Luming Cc: Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 1cbf4c563c0eaaf11c552a88b374e213181c6ddd tree 6ec08fedd46526c3dbed911026e1581c82d50531 parent d2149b542382bfc206cb28485108f6470c979566 author Thomas Renninger Thu, 16 Sep 2004 11:07:00 -0400 committer Len Brown Wed, 30 Nov 2005 22:51:04 -0500 [ACPI] Allow return to active cooling mode once passive mode is entered http://bugzilla.kernel.org/show_bug.cgi?id=3410 https://bugzilla.novell.com/show_bug.cgi?id=131543 Signed-off-by: Thomas Renninger Signed-off-by: Konstantin Karasyov Signed-off-by: Alexey Starikovskiy Signed-off-by: Yu Luming Signed-off-by: Andrew Morton commit c8734a9663806b7ebd3b5e33bae65a60ff6553bd tree 24fe706394e2981866bbf852e1c0e673c94f8e1f parent 8e9887cc3b8d9f1c88c6f3842346a9478e52718f parent e6e87b4bfe3720b4308a8e669078d9be58bc9780 author Len Brown Wed, 30 Nov 2005 22:28:15 -0500 committer Len Brown Wed, 30 Nov 2005 22:28:15 -0500 Pull 5283 into release branch commit e6e87b4bfe3720b4308a8e669078d9be58bc9780 tree 2f839782c4bac7820fc3c7f0c8867990bf4ae739 parent d2149b542382bfc206cb28485108f6470c979566 author David Shaohua Li Wed, 21 Sep 2005 01:35:00 -0400 committer Len Brown Wed, 30 Nov 2005 22:27:16 -0500 [ACPI] properly detect pmtimer on ASUS a8v motherboard Handle FADT 2.0 xpmtmr address 0 case. http://bugzilla.kernel.org/show_bug.cgi?id=5283 Signed-off-by: Shaohua Li Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 8e9887cc3b8d9f1c88c6f3842346a9478e52718f tree 17c32a39e4a9df64501dc3d9f2ca9157b442d387 parent 0a47c906342e2447003e207d23917dfa5c912071 parent d2149b542382bfc206cb28485108f6470c979566 author Len Brown Wed, 30 Nov 2005 22:22:52 -0500 committer Len Brown Wed, 30 Nov 2005 22:22:52 -0500 Auto-update from upstream commit 0a47c906342e2447003e207d23917dfa5c912071 tree 17c32a39e4a9df64501dc3d9f2ca9157b442d387 parent 5d8e7aa6e5c21e14843404c5e4c04d4cf043e40e author Borislav Petkov Wed, 30 Nov 2005 22:12:45 -0500 committer Len Brown Wed, 30 Nov 2005 22:15:25 -0500 [ACPI] delete "default y" on Kconfig for ibm_acpi extras driver Signed-off-by: Borislav Petkov Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 5d8e7aa6e5c21e14843404c5e4c04d4cf043e40e tree 878de75795abb0851f5aa0ade257555d1264b67a parent 7dac562f6d89b3f70c3f12b0e17878b07af42298 author Al Viro Thu, 22 Sep 2005 01:15:57 -0400 committer Len Brown Wed, 30 Nov 2005 21:59:35 -0500 [ACPI] IA64 build: blacklist.c is used only on X86 Signed-off-by: Al Viro Signed-off-by: Len Brown (cherry picked from ef4611613657dfb8af8d336f2f61f08cfcdc9d8a commit) commit 7dac562f6d89b3f70c3f12b0e17878b07af42298 tree be68146ab85763871c93549e42c065caea2cab36 parent 3141b6708dd9ad09b6667c23393cfdc25b127771 parent 4c0335526c95d90a1d958e0059f40a5745fc7c5d author Len Brown Wed, 30 Nov 2005 21:55:14 -0500 committer Len Brown Wed, 30 Nov 2005 21:55:14 -0500 Pull 5165 into release branch commit 3141b6708dd9ad09b6667c23393cfdc25b127771 tree 82bc2f418ab8657a4fef94f3bb90429d3dfd09a4 parent d2149b542382bfc206cb28485108f6470c979566 parent bd7ce5b5ff930c29b1c0405051e9c9388660b785 author Len Brown Wed, 30 Nov 2005 21:55:02 -0500 committer Len Brown Wed, 30 Nov 2005 21:55:02 -0500 Pull 5221 into release branch commit 981d9c176dacf397d267215d44a4060c28663480 tree 85d1f9d73c0eb26a39c61beab397002991bbdae2 parent 3410572d519b6c68505f746f25033de97809eaa1 author Francois Romieu Wed, 30 Nov 2005 22:35:39 +0100 committer Francois Romieu Wed, 30 Nov 2005 22:35:39 +0100 b44: increase version number Signed-off-by: Francois Romieu commit 3410572d519b6c68505f746f25033de97809eaa1 tree 5767b8a1108ecff31e5cf637eb8cdf5d7f020ae0 parent d9e2d185bf01e20339158f77c3fca00b02014912 author Francois Romieu Wed, 30 Nov 2005 22:32:13 +0100 committer Francois Romieu Wed, 30 Nov 2005 22:32:13 +0100 b44: early return in dev->do_ioctl when the device is not up The device has not gone through a whole reset/init sequence until the device is up. Accessing the mii interface before this point is not safe. Signed-off-by: Francois Romieu commit d9e2d185bf01e20339158f77c3fca00b02014912 tree 44cca817c379f9db5bfe457864b51297b5329314 parent 346f7dbb17cb7d84317b4410df2e8f7bf2e57f44 author Mark Lord Wed, 30 Nov 2005 22:30:23 +0100 committer Francois Romieu Wed, 30 Nov 2005 22:30:23 +0100 b44: missing netif_wake_queue() in b44_open() This patch fixes a problem plaguing Dell notebooks with built-in b44 ethernet: The driver refuses to transmit packets of any kind until after the first 5-second tx_timeout occurs. This bug causes DHCP negotiation to fail (timeout) during installation of Ubuntu Linux. Signed-off-by: Mark Lord Signed-off-by: Andrew Morton commit df2f5e721ed36e21da27e1f415c71ba0e20f31b5 tree 1c2df43e11a802a5316d1523bb73e6bd7d152c5a parent d2ef5ebb4c4fe141a82252d4db8d8521e6765c5a author Russell King Wed, 30 Nov 2005 16:02:54 +0000 committer Russell King Wed, 30 Nov 2005 16:02:54 +0000 [ARM SMP] Disable lazy flush_dcache_page for SMP Lazy flush_dcache_page() causes userspace instability on SMP platforms, so disable it for now. Signed-off-by: Russell King commit bd7ce5b5ff930c29b1c0405051e9c9388660b785 tree 7aa081cec117678fd4175b02674fd2f7e3f114db parent d2ef5ebb4c4fe141a82252d4db8d8521e6765c5a author Thomas Renninger Mon, 03 Oct 2005 10:39:00 -0700 committer Len Brown Wed, 30 Nov 2005 04:35:02 -0500 [ACPI] fix HP nx8220 boot hang regression This patch reverts the acpi_bus_find_driver() return value check that came in via the PCI tree via 3fb02738b0fd36f47710a2bf207129efd2f5daa2 [PATCH] acpi bridge hotadd: Allow ACPI .add and .start operations to be done independently This particular change broke booting of some HP/Compaq laptops unless acpi=noirq is used. http://bugzilla.kernel.org/show_bug.cgi?id=5221 https://bugzilla.novell.com/show_bug.cgi?id=116763 Signed-off-by: Thomas Renninger Cc: Rajesh Shah Signed-off-by: Len Brown commit 4c0335526c95d90a1d958e0059f40a5745fc7c5d tree 9a4f6f84f9ba1b1a838e71799470b2acab9e2ba7 parent 6d93c64803a5fea84839789aae13290419c62d92 author Venkatesh Pallipadi Thu, 15 Sep 2005 12:20:00 -0400 committer Len Brown Wed, 30 Nov 2005 03:23:52 -0500 [ACPI] Add support for FADT P_LVL2_UP flag which tells us if C2 is valid for UP-only, or SMP. As there is no separate bit for C3, use P_LVL2_UP bit to cover both C2 and C3. http://bugzilla.kernel.org/show_bug.cgi?id=5165 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown (cherry picked from 28b86b368af3944eb383078fc5797caf2dc8ce44 commit) commit 6d93c64803a5fea84839789aae13290419c62d92 tree 5f3e1391e17d44cd61fcd8d628d8f33880fcd15e parent d2ef5ebb4c4fe141a82252d4db8d8521e6765c5a author Venkatesh Pallipadi Thu, 15 Sep 2005 12:19:00 -0400 committer Len Brown Wed, 30 Nov 2005 03:23:06 -0500 [ACPI] Prefer _CST over FADT for C-state capabilities Note: This ACPI standard compliance may cause regression on some system, if they have _CST present, but _CST value is bogus. "nocst" module parameter should workaround that regression. http://bugzilla.kernel.org/show_bug.cgi?id=5165 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown (cherry picked from 883baf7f7e81cca26f4683ae0d25ba48f094cc08 commit) commit f4e401562c11c7ca65592ebd749353cf0b19af7b tree 3dcd04cef411bb14d8a2a6652b807550aa0eab0c parent e0ae9ecf469fdd3c1ad999efbf4fe6b782f49900 author Jack Morgenstein Tue, 29 Nov 2005 16:57:01 -0800 committer Roland Dreier Tue, 29 Nov 2005 16:57:01 -0800 IB/uverbs: track multicast group membership for userspace QPs uverbs needs to track which multicast groups is each qp attached to, in order to properly detach when cleanup is performed on device file close. Signed-off-by: Jack Morgenstein Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit e0ae9ecf469fdd3c1ad999efbf4fe6b782f49900 tree 9896d3c1093ded78c62da6b9a52b71e282c763e0 parent 267ee88ed34c76dc527eeb3d95f9f9558ac99973 author Michael S. Tsirkin Tue, 29 Nov 2005 11:33:46 -0800 committer Roland Dreier Tue, 29 Nov 2005 11:33:46 -0800 IB/mthca: fix posting of send lists of length >= 255 on mem-free HCAs On mem-free HCAs, when posting a long list of send requests, a doorbell must be rung every 255 requests. Add code to handle this. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 267ee88ed34c76dc527eeb3d95f9f9558ac99973 tree 1f53cd0db55372192cc088788dadbed102845a17 parent 4f71055a45a503273c039d80db8ba9b13cb17549 author Roland Dreier Tue, 29 Nov 2005 10:55:58 -0800 committer Roland Dreier Tue, 29 Nov 2005 10:55:58 -0800 IPoIB: fix error handling in ipoib_open If ipoib_ib_dev_up() fails after ipoib_ib_dev_open() is called, then ipoib_ib_dev_stop() needs to be called to clean up. Signed-off-by: Roland Dreier commit 4f71055a45a503273c039d80db8ba9b13cb17549 tree bb4b6f10197addff1af91368f916904eb4404edf parent 2e86541ec878de9ec5771600a77f451a80bebfc4 author Michael S. Tsirkin Tue, 29 Nov 2005 10:53:30 -0800 committer Roland Dreier Tue, 29 Nov 2005 10:53:30 -0800 IPoIB: protect child list in ipoib_ib_dev_flush race condition: ipoib_ib_dev_flush is accessing child list without locks. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 2e86541ec878de9ec5771600a77f451a80bebfc4 tree e58f418dd8e64675b1dbaa6db92d7c1e606d1506 parent de922487890936470660e89f9095aee980637989 author Roland Dreier Tue, 29 Nov 2005 10:25:23 -0800 committer Roland Dreier Tue, 29 Nov 2005 10:25:23 -0800 IPoIB: don't zero members after we allocate with kzalloc ipoib_mcast_alloc() uses kzalloc(), so there's no need to zero out members of the mcast struct after it's allocated. Signed-off-by: Roland Dreier commit de922487890936470660e89f9095aee980637989 tree bbb88a18ee78fa43c0f887c138011a055a9c8045 parent 5872a9fc28e6cd3a4e51479a50970d19a01573b3 author Michael S. Tsirkin Tue, 29 Nov 2005 10:18:45 -0800 committer Roland Dreier Tue, 29 Nov 2005 10:18:45 -0800 IPoIB: reinitialize mcast structs' completions for every query Make sure mcast->done is initialized to uncompleted value before we submit a new query, so that it's safe to wait on. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 5872a9fc28e6cd3a4e51479a50970d19a01573b3 tree 993e77f7c00b7bc296e96f0cec1c98ea28a0436a parent 65c7eddaba33995e013ef3c04718f6dc8fdf2335 author Roland Dreier Tue, 29 Nov 2005 10:13:54 -0800 committer Roland Dreier Tue, 29 Nov 2005 10:13:54 -0800 IPoIB: always set path->query to NULL when query finishes Always set path->query to NULL when the SA path record query completes, rather than only when we don't have an address handle. Signed-off-by: Roland Dreier commit 65c7eddaba33995e013ef3c04718f6dc8fdf2335 tree 5f96a0797d23e7cee4f2a6c4770bacadee31a261 parent bf6d9e23a36c8a01bf6fbb945387d8ca3870ff71 author Roland Dreier Mon, 28 Nov 2005 21:20:34 -0800 committer Roland Dreier Mon, 28 Nov 2005 21:20:34 -0800 IPoIB: reinitialize path struct's completion for every query It's possible that IPoIB will issue multiple SA queries for the same path struct. Therefore the struct's completion needs to be initialized for each query rather than only once when the struct is allocated, or else we might not wait long enough for later queries to finish and free the path struct too soon. Signed-off-by: Roland Dreier commit bf6d9e23a36c8a01bf6fbb945387d8ca3870ff71 tree 9fd732ebc6b85090b64862c4ee3af7078ba1f822 parent 187a25863fe014486ee834164776b2a587d6934d author Michael S. Tsirkin Mon, 28 Nov 2005 13:07:20 -0800 committer Roland Dreier Mon, 28 Nov 2005 13:07:20 -0800 IB/umad: fix RMPP handling ib_umad_write in user_mad.c is looking at rmpp_hdr field in MAD before checking that the MAD actually has the RMPP header. So for a MAD without RMPP header it looks like we are actually checking a bit inside M_Key, or something. Signed-off-by: Jack Morgenstein Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 187a25863fe014486ee834164776b2a587d6934d tree 918111360e352d128126bb338227ec4fb6e8afbc parent 458af5439fe7ae7d95ca14106844e61f0795166c author Michael S. Tsirkin Mon, 28 Nov 2005 11:19:43 -0800 committer Roland Dreier Mon, 28 Nov 2005 11:19:43 -0800 IB/mthca: reset QP's last pointers when transitioning to reset state last pointer is not updated when QP is modified to reset state. This causes data corruption if WQEs are already posted on the queue. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier