1. 30 Dec, 2006 33 commits
  2. 29 Dec, 2006 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 7479b1ce
      Linus Torvalds authored
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] cio: fix stsch_reset.
        [S390] Change max. buffer size for monwriter device.
      7479b1ce
    • Linus Torvalds's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb · 4945b8a5
      Linus Torvalds authored
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (28 commits)
        V4L/DVB (5010): Cx88: Fix leadtek_eeprom tagging
        V4L/DVB (5012): Usbvision fix: It was using "&&" instead "&"
        V4L/DVB (5001): Add two required headers on kernel 2.6.20-rc1
        V4L/DVB (5014): Allyesconfig build fixes on some non x86 arch
        V4L/DVB (4997): Bttv: delete duplicated ioremap()
        V4L/DVB (4996): Msp3400: fix kthread_run error check
        V4L/DVB (4995): Vivi: fix kthread_run() error check
        V4L/DVB (4994): Vivi: fix use after free in list_for_each()
        V4L/DVB (4992): Fix typo in saa7134-dvb.c
        V4L/DVB (4991): Cafe_ccic.c: fix NULL dereference
        V4L/DVB (4990): Cpia2/cpia2_usb.c: fix error-path leak
        V4L/DVB (4988): Cx2341x audio_properties is an u16, not u8
        V4L/DVB (4984): LOG_STATUS should show the real temporal filter value.
        V4L/DVB (4983): Force temporal filter to 0 when scaling to prevent ghosting.
        V4L/DVB (4982): Fix broken audio mode handling for line-in in msp3400.
        V4L/DVB (4980): Fixes bug 7267: PAL/60 is not working
        V4L/DVB (4979): Fixes compilation when CONFIG_V4L1_COMPAT is not selected
        V4L/DVB (4973): Dvb-core: fix printk type warning
        V4L/DVB (4972): Dvb-core: fix bug in CRC-32 checking on 64-bit systems
        V4L/DVB (4970): Usbvision memory fixes
        ...
      4945b8a5
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 6c722e90
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (42 commits)
        r8169: extraneous Cmd{Tx/Rx}Enb write
        forcedeth: modified comment header
        NetXen: Reducing ring sizes for IOMMU issue.
        NetXen: Fix for PPC machines.
        NetXen: work queue fixes.
        NetXen: Link status message correction for quad port cards.
        NetXen: Multiple adapter fix.
        NetXen: Using correct CHECKSUM flag.
        NetXen: driver reload fix for newer firmware.
        NetXen: Adding new device ids.
        PHY probe not working properly for ibm_emac (PPC4xx)
        ep93xx: some minor cleanups to the ep93xx eth driver
        sky2: phy power down needs PCI config write enabled
        sky2: power management/MSI workaround
        sky2: dual port NAPI problem
        via-velocity uses INET interfaces
        e1000: Do not truncate TSO TCP header with 82544 workaround
        myri10ge: handle failures in suspend and resume
        myri10ge: no need to save MSI and PCIe state in the driver
        myri10ge: make msi configurable at runtime through sysfs
        ...
      6c722e90
    • Linus Torvalds's avatar
      Merge branch 'netxen-ioctl' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 007fb598
      Linus Torvalds authored
      * 'netxen-ioctl' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        netxen: remove private ioctl
      007fb598
    • Linus Torvalds's avatar
      VM: Fix nasty and subtle race in shared mmap'ed page writeback · 7658cc28
      Linus Torvalds authored
      The VM layer (on the face of it, fairly reasonably) expected that when
      it does a ->writepage() call to the filesystem, it would write out the
      full page at that point in time.  Especially since it had earlier marked
      the whole page dirty with "set_page_dirty()".
      
      But that isn't actually the case: ->writepage() does not actually write
      a page, it writes the parts of the page that have been explicitly marked
      dirty before, *and* that had not got written out for other reasons since
      the last time we told it they were dirty.
      
      That last caveat is the important one.
      
      Which _most_ of the time ends up being the whole page (since we had
      called "set_page_dirty()" on the page earlier), but if the filesystem
      had done any dirty flushing of its own (for example, to honor some
      internal write ordering guarantees), it might end up doing only a
      partial page IO (or none at all) when ->writepage() is actually called.
      
      That is the correct thing in general (since we actually often _want_
      only the known-dirty parts of the page to be written out), but the
      shared dirty page handling had implicitly forgotten about these details,
      and had a number of cases where it was doing just the "->writepage()"
      part, without telling the low-level filesystem that the whole page might
      have been re-dirtied as part of being mapped writably into user space.
      
      Since most of the time the FS did actually write out the full page, we
      didn't notice this for a loong time, and this needed some really odd
      patterns to trigger.  But it caused occasional corruption with rtorrent
      and with the Debian "apt" database, because both use shared mmaps to
      update the end result.
      
      This fixes it. Finally. After way too much hair-pulling.
      Acked-by: default avatarNick Piggin <nickpiggin@yahoo.com.au>
      Acked-by: default avatarMartin J. Bligh <mbligh@google.com>
      Acked-by: default avatarMartin Michlmayr <tbm@cyrius.com>
      Acked-by: default avatarMartin Johansson <martin@fatbob.nu>
      Acked-by: default avatarIngo Molnar <mingo@elte.hu>
      Acked-by: default avatarAndrei Popa <andrei.popa@i-neo.ro>
      Cc: High Dickins <hugh@veritas.com>
      Cc: Andrew Morton <akpm@osdl.org>,
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Segher Boessenkool <segher@kernel.crashing.org>
      Cc: David Miller <davem@davemloft.net>
      Cc: Arjan van de Ven <arjan@infradead.org>
      Cc: Gordon Farquharson <gordonfarquharson@gmail.com>
      Cc: Guillaume Chazarain <guichaz@yahoo.fr>
      Cc: Theodore Tso <tytso@mit.edu>
      Cc: Kenneth Cheng <kenneth.w.chen@intel.com>
      Cc: Tobias Diedrich <ranma@tdiedrich.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      7658cc28
  3. 27 Dec, 2006 2 commits