ChangeSet@1.1573, 2005-01-24 21:16:35-02:00, marcelo@logos.cnet Merge bk://linux@linux.bkbits.net/linux-2.4 into logos.cnet:/home/marcelo/bk/linux-2.4 ChangeSet@1.1571.1.2, 2005-01-24 16:59:07-02:00, paul.clements@steeleye.com [PATCH] Rogier Wolff: fix nbd ioctl permissions Here's a patch for nbd that Rogier recently sent me. It allows non-root to do BLKGETSIZE, et al. on nbd devices, which he needs for his data recovery applications. From: Rogier Wolff Signed-Off-By: Paul Clements Description: We shouldn't need CAP_SYS_ADMIN to ask for disk capacity and such. ChangeSet@1.1571.1.1, 2005-01-24 16:51:44-02:00, marcelo@logos.cnet [PATCH] Karsten Keil: Eicon Diva PCI 2.02 bugfix This bugfix solve a race between card initialization and S0 bus events, if the S0 bus is already active on driver load time. Signed-off-by: Karsten Keil ChangeSet@1.1572, 2005-01-24 12:48:08-02:00, paul.clements@steeleye.com [PATCH] nbd: fix ioctl permissions Here's a patch for nbd that Rogier recently sent me. It allows non-root to do BLKGETSIZE, et al. on nbd devices, which he needs for his data recovery applications. ChangeSet@1.1571, 2005-01-24 07:36:05-02:00, khali@linux-fr.org [PATCH] PCI: Kill duplicate definition of INTEL_82801DB_10 I noticed that PCI_DEVICE_ID_INTEL_82801DB_10 is currently defined twice in linux-2.4.29/include/linux/pci_ids.h. The trivial patch below kills the second definition. Signed-off-by: Jean Delvare ChangeSet@1.1570, 2005-01-19 14:57:17-02:00, trini@kernel.crashing.org [PATCH] ppc32: Fix a problem with the TLB Miss handler There is a problem in the TLB Miss (and Error, as they jump to the Miss handler) handlers. The problem is that when an app spans more than one L1 entry, we don't have all of the correct information, and do_page_fault() things a protection fault happened, when it didn't really. The fix for this is to modify the handlers slightly to force a TLB Error in this case. Lots of suggestions from: Joakim Tjernlund Signed-off-by: Tom Rini ChangeSet@1.1569, 2005-01-19 14:16:32-02:00, temnota@kmv.ru [PATCH] Prevent NMI oopser from triggering when megaraid2 waits for abort/reset cmd completion > We should backport msleep() in 2.4.29-pre1. Ok, msleep() backported, but driver isn't fixed. This patch acceptable? Prevent NMI oopser kill kernel thread when megaraid2 driver waiting abort or reset command completion. Signed-off-by: Andrey Melnikov ChangeSet@1.1568, 2005-01-19 14:09:30-02:00, marcelo@logos.cnet Change VERSION to v2.4.29 TAG: v2.4.29