1. 02 Mar, 2007 4 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · fb7d4045
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [TCP]: Fix minisock tcp_create_openreq_child() typo.
        [TCP]: Document several sysctls.
        [NET]: Fix kfree(skb)
        [NET]: Handle disabled preemption in gfp_any()
        [BRIDGE]: Fix locking of set path cost.
        [IPV6]: /proc/net/anycast6 unbalanced inet6_dev refcnt
        [IPX]: Remove ancient changelog
        [IPX]: Remove outdated information from Kconfig
        [NET]: Revert socket.h/stat.h ifdef hacks.
        [IPV6]: anycast refcnt fix
        [XFRM] xfrm_user: Fix return values of xfrm_add_sa_expire.
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb · 100b4254
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
        V4L/DVB (5305): Mark VIDIOC_DBG_S/G_REGISTER as experimental
        V4L/DVB (5270): Add VIDIOC_G_ENC_INDEX ioctl
        V4L/DVB (5276): Cxusb: fix firmware patch for big endian systems
        V4L/DVB (5258): Cafe_ccic: fix compiler warning
        V4L/DVB (5295): Digitv: open nxt6000 i2c_gate for TDED4 tuner handling
        V4L/DVB (5304): Improve chip matching in v4l2_register
        V4L/DVB (5255): Fix cx25840 firmware loading.
    • Ralf Baechle's avatar
      [PATCH] Fix sysfs build breakage if !CONFIG_SYSFS · d701d8a3
      Ralf Baechle authored
      B0rkage introduced by dfa87c82.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Adam Litke's avatar
      [PATCH] Fix get_unmapped_area and fsync for hugetlb shm segments · 516dffdc
      Adam Litke authored
      This patch provides the following hugetlb-related fixes to the recent stacked
      shm files changes:
       - Update is_file_hugepages() so it will reconize hugetlb shm segments.
       - get_unmapped_area must be called with the nested file struct to handle
         the sfd->file->f_ops->get_unmapped_area == NULL case.
       - The fsync f_op must be wrapped since it is specified in the hugetlbfs
      This is based on proposed fixes from Eric Biederman that were debugged and
      tested by me.  Without it, attempting to use hugetlb shared memory segments
      on powerpc (and likely ia64) will kill your box.
      Signed-off-by: default avatarAdam Litke <agl@us.ibm.com>
      Cc: Eric Biederman <ebiederm@xmission.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Acked-by: default avatarWilliam Irwin <bill.irwin@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
  2. 01 Mar, 2007 36 commits