1. 27 Sep, 2002 20 commits
    • Kai Germaschewski's avatar
      Hand merged. · 67f46677
      Kai Germaschewski authored
      67f46677
    • Kai Germaschewski's avatar
      ISDN: cleanup ISDN net / ioctl code · 36743e75
      Kai Germaschewski authored
      Try to convert the setup of network interfaces into something readable.
      In particular, use dummy inline functions to get rid of
      #ifdef CONFIG_ISDN_* spread all over the place everywhere and separate 
      stuff into smaller functions.
      36743e75
    • Linus Torvalds's avatar
      Add CVS files to the list of files ignored by "find".and make · c2dd03a9
      Linus Torvalds authored
      the same ignore rules for "tar" as well.
      c2dd03a9
    • Ben Collins's avatar
      c80cb158
    • Andi Kleen's avatar
      [PATCH] disable early console in console_init · 09baf27a
      Andi Kleen authored
      x86-64 has an early console implementation which runs before the normal
      console is initialized. To avoid duplicated output it needs to be
      disabled when the real console starts. This patch adds an function call
      for that to the appropiate part of console_init.
      09baf27a
    • Andi Kleen's avatar
      [PATCH] PCI ID for AMD 8151 AMD bridge · ac5ba7cf
      Andi Kleen authored
      Add the PCI IDs of an AMD 8151 AGP bridge.
      ac5ba7cf
    • Andi Kleen's avatar
      [PATCH] Hammer aperture driver for 2.5.38 · 6d86415e
      Andi Kleen authored
      Add an AGP driver for the AGP aperture in the northbridge of the AMD Hammer.
      The AGP driver works for both 32bit and 64bit kernels.
      
      It also adds some hooks to the AGP driver to allow the x86-64 GART based
      IOMMU code to share the aperture with AGP. The hooks are intentionally kept
      minimalistic. In addition it needs some Config.in hackery, because AGP cannot
      be modular in this case, because the IOMMU needs to control its startup and
      it runs early when PCI is initialized.
      
      The original AGP driver was done by Dave Jones, I added the IOMMU support.
      6d86415e
    • Andi Kleen's avatar
      [PATCH] Fix ELF name for x86-64 · a790a5cb
      Andi Kleen authored
      Align ELF binary name for x86-64 with ABI.
      
      Required for the x86-64 merge in other mail.
      a790a5cb
    • Andi Kleen's avatar
      [PATCH] Minor ACPI changes for x86-64 · 89196183
      Andi Kleen authored
      Make CONFIG_ACPI_SLEEP dependent on software suspend (because suspend
      is not working yet on x86-64)
      
      Add support for the HPET tables.
      89196183
    • Petr Vandrovec's avatar
      [PATCH] Fix matroxfb compile on m68k · 39188136
      Petr Vandrovec authored
      The m68k architecture define is __mc68000__, not __m68k__.
      
      From Andreas Schwab <schwab@suse.de>.
      39188136
    • Petr Vandrovec's avatar
      [PATCH] Fix matroxfb compile when G450 support is not selected · 9b6641c7
      Petr Vandrovec authored
        Fix undefined symbol references when support for G100 is requested,
      but support for G450 is not.
      9b6641c7
    • Linus Torvalds's avatar
      Merge bk://jfs.bkbits.net/linux-2.5 · 2b5d343e
      Linus Torvalds authored
      into home.transmeta.com:/home/torvalds/v2.5/linux
      2b5d343e
    • Dave Kleikamp's avatar
      Merge jfs@jfs.bkbits.net:linux-2.5 · 3aa8e204
      Dave Kleikamp authored
      into kleikamp.austin.ibm.com:/home/shaggy/bk/jfs-2.5
      3aa8e204
    • Dave Kleikamp's avatar
      JFS: Remove assert(i < MAX_ACTIVE) · b275001f
      Dave Kleikamp authored
      If the log (journal) superblock is changed between the time we mount
      and unmount the volume, don't trap.  Instead complain, and exit
      gracefully.
      b275001f
    • Matthew Wilcox's avatar
      [PATCH] fix file_lock_cache leak · 3c4cb3be
      Matthew Wilcox authored
      Always free the request, not just on error.
      3c4cb3be
    • Jens Axboe's avatar
      [PATCH] more io scheduler updates · 156889a0
      Jens Axboe authored
      Small problem, we must of course also remember to take into account
      where the last service point was (or will be).
      
      deadline_get_last_sector() either returns the last offset serviced, or
      the last one that will be (back of dispatch queue).
      
      Otherwise the insert-at-head can be very unfair.
      156889a0
    • Linus Torvalds's avatar
      Merge · 28909415
      Linus Torvalds authored
      28909415
    • Jaroslav Kysela's avatar
      ISA PnP change · 51c76e24
      Jaroslav Kysela authored
        Jens Thoms Toerring <Jens.Toerring@physik.fu-berlin.de>
          - RDP must be reset only in isolation phase
      51c76e24
    • Geoffrey Lee's avatar
      [PATCH] MODULE_LICENSE for i82092 pcmcia. · 3b1bbff1
      Geoffrey Lee authored
      It appears that during the MODULE_LICENSE merge for pcmcia i82092 was
      missed.
      
      Here is a trivial patch to correct this.
      3b1bbff1
    • Jens Axboe's avatar
      [PATCH] io scheduler update · 33fb2ab5
      Jens Axboe authored
      This fixes a problem with the deadline io scheduler, if the correct
      insertion point is at the front of the list.  This is something that we
      never have gotten right in 2.4 either.
      
      The problem is that the elevator merge function has to return a pointer
      to a struct request, and for front insert we really have to return the
      head of the list which cannot be expressed as a request of course.
      
      The real issue is that the elevator_merge function actually performs two
      functions - it scans for a merge, and if it can't find any, it selects
      and insertion point.  It's done this way for efficiency reasons, even if
      the design isn't all that clean.
      
      So we change the io scheduler merge functions to get passed a pointer to
      a list_head pointer instead.  This works for both inserts and merges.
      In addition, deadline checks if it really should insert at the very
      front.
      
      Also don't pass in request to elv_try_last_merge(), the very name of the
      function suggests that it's q->last_merge that we are interested in.
      33fb2ab5
  2. 26 Sep, 2002 20 commits