1. 15 Jun, 2007 3 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 21c562e3
      Linus Torvalds authored
      * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm: fix radeon setparam on 32/64 bit systems.
        drm/i915:  Add support for the G33, Q33, and Q35 chipsets.
        i915: add new pciids for 945GME, 965GME/GLE
      21c562e3
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6 · aba29792
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (30 commits)
        [PARISC] remove global_ack_eiem
        [PARISC] Fix kernel panic in check_ivt
        [PARISC] Fix bug when syscall nr is __NR_Linux_syscalls
        [PARISC] be more defensive in process.c::get_wchan
        [PARISC] fix "reduce size of task_struct on 64-bit machines" fallout
        [PARISC] fix null ptr deref in unwind.c
        [PARISC] fix trivial spelling nit in asm/linkage.h
        [PARISC] remove remnants of parisc-specific softirq code
        [PARISC] fix section mismatch in smp.c
        [PARISC] fix "ENTRY" macro redefinition
        [PARISC] Wire up utimensat/signalfd/timerfd/eventfd syscalls
        [PARISC] fix section mismatch in superio serial drivers
        [PARISC] fix section mismatch in parisc eisa driver
        [PARISC] fix section mismatches in arch/parisc/kernel
        [PARISC] fix section mismatch in ccio-dma
        [PARISC] fix section mismatch in parisc STI video drivers
        [PARISC] fix section mismatch in parport_gsc
        [PARISC] fix lasi_82596 build
        [PARISC] Build fixes for power.c
        [PARISC] kobject is embedded in subsys, not kset
        ...
      aba29792
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart · 08f3dfe8
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
        [AGPGART] intel_agp: fix device probe
      08f3dfe8
  2. 14 Jun, 2007 7 commits
    • Linus Torvalds's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 0127d6d5
      Linus Torvalds authored
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Fix args to sun4v_ldc_revoke().
        [SPARC64]: Really fix parport.
        [SPARC64]: Fix IO/MEM space sizing for PCI.
        [SPARC64]: Wire up cookie based sun4v interrupt registry.
      0127d6d5
    • Wang Zhenyu's avatar
      [AGPGART] intel_agp: fix device probe · 88889851
      Wang Zhenyu authored
      This patch trys to fix device probe in two cases. First we should
      correctly detect device if integrated graphics device is not enabled
      or exists, like an add-in card is plugged. Second on some type of intel
      GMCH, it might have multiple graphic chip models, like 945GME case, so
      we should be sure the detect works through the whole table.
      Signed-off-by: default avatarWang Zhenyu <zhenyu.z.wang@intel.com>
      Signed-off-by: default avatarDave Jones <davej@redhat.com>
      88889851
    • Linus Torvalds's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 1e0e76cf
      Linus Torvalds authored
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [IPV6] addrconf: Fix IPv6 on tuntap tunnels
        [TCP]: Add missing break to TCP option parsing code
        [SCTP] Don't disable PMTU discovery when mtu is small
        [SCTP] Flag a pmtu change request
        [SCTP] Update pmtu handling to be similar to tcp
        [SCTP] Fix leak in sctp_getsockopt_local_addrs when copy_to_user fails
        [SCTP]: Allow unspecified port in sctp_bindx()
        [SCTP]: Correctly set daddr for IPv6 sockets during peeloff
        [TCP]: Set initial_ssthresh default to zero in Cubic and BIC.
        [TCP]: Fix left_out setting during FRTO
        [TCP]: Disable TSO if MD5SIG is enabled.
        [PPP_MPPE]: Fix "osize too small" check.
        [PATCH] mac80211: Don't stop tx queue on master device while scanning.
        [PATCH] mac80211: fix debugfs tx power reduction output
        [PATCH] cfg80211: fix signed macaddress in sysfs
        [IrDA]: f-timer reloading when sending rejected frames.
        [IrDA]: Fix Rx/Tx path race.
      1e0e76cf
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · f701737d
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 4445/1: ANUBIS: Fix CPLD registers
        [ARM] 4444/2: OSIRIS: CPLD suspend fix
        [ARM] 4443/1: OSIRIS: Add watchdog device to machine devices
        [ARM] 4442/1: OSIRIS: Fix CPLD register definitions
        [ARM] VFP: fix section mismatch error
      f701737d
    • David S. Miller's avatar
    • Herbert Xu's avatar
      [IPV6] addrconf: Fix IPv6 on tuntap tunnels · 74235a25
      Herbert Xu authored
      The recent patch that added ipv6_hwtype is broken on tuntap tunnels.
      Indeed, it's broken on any device that does not pass the ipv6_hwtype
      test.
      
      The reason is that the original test only applies to autoconfiguration,
      not IPv6 support.  IPv6 support is allowed on any device.  In fact,
      even with the ipv6_hwtype patch applied you can still add IPv6 addresses
      to any interface that doesn't pass thw ipv6_hwtype test provided that
      they have a sufficiently large MTU.  This is a serious problem because
      come deregistration time these devices won't be cleaned up properly.
      
      I've gone back and looked at the rationale for the patch.  It appears
      that the real problem is that we were creating IPv6 devices even if the
      MTU was too small.  So here's a patch which fixes that and reverts the
      ipv6_hwtype stuff.
      
      Thanks to Kanru Chen for reporting this issue.
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      74235a25
    • Ilpo Järvinen's avatar
      [TCP]: Add missing break to TCP option parsing code · d7ea5b91
      Ilpo Järvinen authored
      This flaw does not affect any behavior (currently).
      Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d7ea5b91
  3. 13 Jun, 2007 19 commits
  4. 12 Jun, 2007 11 commits