commit 694593e3374a67d95ece6a275a1f181644c2c4d8
Merge: 21209b6... e07a4b9...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Feb 24 15:42:08 2009 -0800

    Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc
    
    * 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
      proc: fix PG_locked reporting in /proc/kpageflags

commit 21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d
Merge: a792cd1... 531660e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Feb 24 15:40:19 2009 -0800

    Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
    
    * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
      Add i2c_board_info for RiscPC PCF8583
      i2c: Make sure i2c_algo_bit_data.timeout is HZ-independent
      i2c-dev: Clarify the unit of ioctl I2C_TIMEOUT
      i2c: Timeouts reach -1
      i2c: Fix misplaced parentheses

commit a792cd12cf07cf77c7d1d41b46b4f8327ecf82d0
Merge: 4daa068... e73bf9f...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Feb 24 15:39:54 2009 -0800

    Merge branch 'firedtv-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
    
    * 'firedtv-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firedtv: dvb_frontend_info for FireDTV S2, fix "frequency limits undefined" error
      firedtv: massive refactoring
      firedtv: rename files, variables, functions from firesat to firedtv
      firedtv: Use DEFINE_SPINLOCK
      firedtv: fix registration - adapter number could only be zero
      firedtv: use length_field() of PMT as length
      firedtv: fix returned struct for ca_info
      firedtv: cleanups and minor fixes
      ieee1394: remove superfluous assertions
      ieee1394: inherit ud vendor_id from node vendor_id
      ieee1394: add hpsb_node_read() and hpsb_node_lock()
      ieee1394: use correct barrier types between accesses of nodeid and generation
      firesat: copyrights, rename to firedtv, API conversions, fix remote control input
      firesat: avc resend
      firesat: update isochronous interface, add CI support
      firesat: add DVB-S support for DVB-S2 devices
      firesat: fix DVB-S2 device recognition
      DVB: add firesat driver

commit 4daa0682af15b24e9d66ccde3a5d502682e572d8
Merge: f7e603a... ebd3610...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Feb 24 15:39:34 2009 -0800

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: Fix deadlock in ext4_write_begin() and ext4_da_write_begin()
      ext4: Add fallback for find_group_flex

commit 531660ef5604c75de6fdead9da1304051af17c09
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date:   Tue Feb 24 19:19:50 2009 +0100

    Add i2c_board_info for RiscPC PCF8583
    
    Add the necessary i2c_board_info structure to fix the lack of PCF8583
    RTC on RiscPC.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Alessandro Zummo <a.zummo@towertech.it>

commit 082a4cf80966ebcd08bf775cd258171cdd85c1a1
Author: Jean Delvare <khali@linux-fr.org>
Date:   Tue Feb 24 19:19:49 2009 +0100

    i2c: Make sure i2c_algo_bit_data.timeout is HZ-independent
    
    i2c_algo_bit_data.timeout is supposed to be in jiffies, so drivers
    should use set this value in terms of HZ.
    
    Ultimately I think this field should be discarded in favor of
    i2c_adapter.timeout, but that's left for a future patch.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Acked-by: Lennert Buytenhek <kernel@wantstofly.org>
    Acked-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>

commit cd97f39b7cdf1c8a9c9f52865eec795b7f0c811d
Author: Jean Delvare <khali@linux-fr.org>
Date:   Tue Feb 24 19:19:49 2009 +0100

    i2c-dev: Clarify the unit of ioctl I2C_TIMEOUT
    
    The unit in which user-space can set the bus timeout value is jiffies
    for historical reasons (back when HZ was always 100.) This is however
    not good because user-space doesn't know how long a jiffy lasts. The
    timeout value should instead be set in a fixed time unit. Given the
    original value of HZ, this unit should be 10 ms, for compatibility.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Wolfram Sang <w.sang@pengutronix.de>

commit a746b578d8406b2db0e9f0d040061bc1f78433cf
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Tue Feb 24 19:19:48 2009 +0100

    i2c: Timeouts reach -1
    
    With a postfix decrement these timeouts reach -1 rather than 0, but
    after the loop it is tested whether they have become 0.
    
    As pointed out by Jean Delvare, the condition we are waiting for should
    also be tested before the timeout. With the current order, you could
    exit with a timeout error while the job is actually done.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit f29d2e0275a4f03ef2fd158e484508dcb0c64efb
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Tue Feb 24 19:19:48 2009 +0100

    i2c: Fix misplaced parentheses
    
    Fix misplaced parentheses.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit e07a4b9217d1e97d2f3a62b6b070efdc61212110
Author: Helge Bahmann <helge.bahmann@secunet.com>
Date:   Fri Feb 20 16:24:12 2009 +0300

    proc: fix PG_locked reporting in /proc/kpageflags
    
    Expr always evaluates to zero.
    
    Cc: Matt Mackall <mpm@selenic.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

commit e73bf9f135fe1e5db646e668676d22af3008e0c0
Author: Beat Michel Liechti <bml303@gmail.com>
Date:   Tue Feb 24 15:52:49 2009 +0100

    firedtv: dvb_frontend_info for FireDTV S2, fix "frequency limits undefined" error
    
    I found that the function fdtv_frontend_init in the file firedtv-fe.c was
    missing a case for FIREDTV_DVB_S2 which resulted in "frequency limits
    undefined" errors in syslog.
    
    Signed-off-by: Beat Michel Liechti <bml303@gmail.com>
    
    Change by Stefan R: combine it with case case FIREDTV_DVB_S as
    originally suggested by Beat Michel.  This enables FE_CAN_FEC_AUTO also
    for FireDTV-S2 devices which is possible as long as only DVB-S channels
    are used.  FE_CAN_FEC_AUTO would be wrong for DVB-S2 channels, but those
    cannot be used yet since the driver is not yet converted to S2API.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 154907957f9391b1af997b57507b16c018cc4995
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Mon Feb 23 14:21:10 2009 +0100

    firedtv: massive refactoring
    
    Combination of the following changes:
    
    Mon, 23 Feb 2009 14:21:10 +0100 (CET)
    firedtv: reinstate debug logging option
    
        Henrik Kurelid tells me that FCP debug logging (which I removed during
        cleanups) is still useful when working on driver issues together with
        end users.  So bring it back in an updated form with only 60% of the
        original code footprint.
    
        Logging can be enabled with
        # echo -1 > /sys/module/firedtv/parameters/debug
    
        1 instead of -1 enables only FCP header logging,
        2 instead of -1 enables only hexdumps of the entire FCP frames.
        0 switches logging off again.
    
    Fri, 20 Feb 2009 20:54:27 +0100 (CET)
    firedtv: build fix for INPUT=m and DVB_FIREDTV=y
    
    Thu, 19 Feb 2009 20:40:39 +0100
    firedtv: use msecs_to_jiffies
    
        Pointed out by Mauro Carvalho Chehab.
    
    Sun Feb 15 20:50:46 CET 2009
    firedtv: some more housekeeping
    
        Fix an old checkpatch warning and a new compiler warning.
    
    Sun Feb 15 15:33:17 CET 2009
    firedtv: rename a file once more
    
        At the moment, about a third of avc.c is specific to FireDTVs rather
        than generic AV/C code.  Rename it to firedtv-avc.c.
    
    Sun Feb 15 15:33:17 CET 2009
    firedtv: dvb demux: more compact channels backing store
    
        Replace struct firedtv_channel { bool active; int pid; } channel[16];
        by unsigned long channel_active; u16 channel_pid[16];.
    
    Sun Feb 15 15:33:17 CET 2009
    firedtv: dvb demux: some simplifications
    
        c->active was unnecessarily cleared twice.
    
        Also, by marking the channel inactive before the for loop,
        the loop becomes identical with fdtv_channel_collect().
    
    Sun Feb 15 15:33:17 CET 2009
    firedtv: dvb demux: remove a bogus loop
    
        This loop is unnecessary because
          - only active channel[].pid's will be sent to the device,
          - when a channel is activated, its pid is set to dvbdmxfeed->pid.
    
        Perhaps the original code was there because it was initially not fully
        covered by the fdtv->demux_mutex.
    
    Sun Feb 15 15:33:17 CET 2009
    firedtv: dvb demux: fix mutex protection
    
        fdtv_start_feed() accessed the channel list unsafely.
        Fully serialize it with itself and fdtv_stop_feed().
    
    Sun Feb 15 15:33:17 CET 2009
    firedtv: dvb demux: fix missing braces
    
        Original code was:
                ...
                case DMX_TS_PES_OTHER:
                        //Dirty fix to keep firesat->channel pid-list up to date
                        for(k=0;k<16;k++){
                                if(firesat->channel[k].active == 0)
                                        firesat->channel[k].pid =
                                                dvbdmxfeed->pid;
                                        break;
                        }
                        channel = firesat_channel_allocate(firesat);
                        break;
                default:
                ...
    
        Looks bogus in several respects. For now let's just add braces to the if
        because that seems to be what the author meant.
    
    Sun Feb 15 15:33:17 CET 2009
    firedtv: allow build without input subsystem
    
        !CONFIG_INPUT is very unlikely on systems on which firedtv is of
        interest.  But we can easily support it.
    
    Sun Feb 15 15:33:17 CET 2009
    firedtv: replace EXTRA_CFLAGS by ccflags
    
        The former are deprecated.
        The latter can depend on Kconfig variables.
    
    Sun Feb 15 15:33:17 CET 2009
    firedtv: concentrate ieee1394 dependencies
    
        Move the entire interface with drivers/ieee1394 to firedtv-1394.c.
        Move 1394-independent module initialization code to firedtv-dvb.c.
    
        This prepares interfacing with drivers/firewire.
    
    Sun Feb 15 15:33:17 CET 2009
    firedtv: amend Kconfig menu prompt
    
    Sun Feb 15 15:33:17 CET 2009
    firedtv: remove kernel version compatibility macro
    
    Sun Feb 15 15:33:17 CET 2009
    firedtv: combine header files
    
        avc.h and firedtv-*.h are small and currently not shared with other
        drivers, hence concatenate them all into firedtv.h.
    
    Sun Feb 15 15:33:17 CET 2009
    firedtv: misc style touch-ups
    
        Standardize on lower-case hexadecimal constants.  Adjust whitespace.
        Omit unnecessary pointer type casts and an unnecessary list head
        initialization.  Use dev_printk.
    
    Wed Feb 11 21:21:04 CET 2009
    firedtv: avc, ci: remove unused constants
    
    Wed Feb 11 21:21:04 CET 2009
    firedtv: avc: remove bitfields from read descriptor response operands
    
        Don't use bitfields in struct types of on-the-wire data.
    
    Wed Feb 11 21:21:04 CET 2009
    firedtv: avc: remove bitfields from DSD command operands
    
        Don't use bitfields in struct types of on-the-wire data.
    
    Wed Feb 11 21:21:04 CET 2009
    firedtv: avc: header file cleanup
    
        Remove unused constants and declarations.
        Move privately used constants into .c files.
    
    Wed Feb 11 21:21:04 CET 2009
    firedtv: avc: remove bitfields from FCP frame types
    
        Don't use bitfields in struct types of on-the-wire data.
    
        Also move many privately used constants from avc.h to avc.c
        and remove some unused constants.
    
    Sun, 18 Jan 2009 16:30:00 +0100 (CET)
    firedtv: avc: fix offset in avc_tuner_get_ts
    
        The parentheses were wrong.  It didn't matter though because this code
        only writes a 0 into an area which is already initialized to 0.
    
    Sun, 18 Jan 2009 16:30:00 +0100 (CET)
    firedtv: avc: reduce stack usage, remove two typedefs
    
        It is safe to share a memory buffer for command frame and response frame
        because the response data come in after the command frame was last used.
    
        Even less stack would be required if only the actual required frame size
        instead of the entire FCP register size was allocated.
    
        Also, rename the defined types AVCCmdFrm and AVCRspFrm to
        struct avc_command_frame and struct avc_response_frame.
        TODO:  Remove the bitfields in these types.
    
    Sun, 18 Jan 2009 16:30:00 +0100 (CET)
    firedtv: cmp: move code to avc
    
    Sun, 18 Jan 2009 16:30:00 +0100 (CET)
    firedtv: iso: move code to firedtv-1394
    
    Sun, 18 Jan 2009 16:30:00 +0100 (CET)
    firedtv: iso: remove unnecessary struct type definitions
    
    Sun, 18 Jan 2009 16:30:00 +0100 (CET)
    firedtv: iso: style changes and fixlets
    
        Add cleanup after failure in setup_iso_channel.
        Replace printk() by dv_err().
        Decrease indentation level in rawiso_activity_cb().
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit a70f81c1c0dac113ac4705e7701e2676e67905cd
Author: Rambaldi <Rambaldi@xs4all.nl>
Date:   Sat Jan 17 14:47:34 2009 +0100

    firedtv: rename files, variables, functions from firesat to firedtv
    
    Combination of the following changes:
    
    Sat, 17 Jan 2009 14:47:34 +0100
    firedtv: rename variables and functions from firesat to firedtv
    
        Signed-off-by: Rambaldi <Rambaldi@xs4all.nl>
    
        Additional changes by Stefan Richter:
    
        Renamed struct firedtv *firedtv to struct firedtv *fdtv and
        firedtv_foo_bar() to fdtv_foo_bar() for brevity.
    
    Sat, 17 Jan 2009 13:07:44 +0100
    firedtv: rename files from firesat to firedtv
    
        Signed-off-by: Rambaldi <Rambaldi@xs4all.nl>
    
        Additional changes by Stefan Richter:
    
        Name the directory "firewire" instead of "firedtv".
        Standardize on "-" instead of "_" in file names, because that's what
        drivers/firewire/ and drivers/media/dvb/dvb-usb/ use too.
        Build fix.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 291f006efeebeeb2073289e44efb8f97cf157220
Author: Julia Lawall <julia@diku.dk>
Date:   Thu Dec 25 15:34:25 2008 +0100

    firedtv: Use DEFINE_SPINLOCK
    
    SPIN_LOCK_UNLOCKED is deprecated.  The following makes the change suggested
    in Documentation/spinlocks.txt
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit a40bf5591681f707afcf550cdcb4cc1697a29504
Author: Henrik Kurelid <henrik@kurelid.se>
Date:   Mon Dec 15 08:17:12 2008 +0100

    firedtv: fix registration - adapter number could only be zero
    
    There was a bug causing the initialization to fail if adapter number was
    greater than zero. The adapter was however registered which caused the driver
    to oops the second time initialization was tried.
    
    Signed-off-by: Henrik Kurelid <henrik@kurelid.se>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 7199e523ef71d24cd8030ea454fca00bb52d58f0
Author: Henrik Kurelid <henrik@kurelid.se>
Date:   Fri Dec 5 10:00:16 2008 +0100

    firedtv: use length_field() of PMT as length
    
    Parsed and used the length_field() of the PMT message instead of using
    the length field of the message struct, which does not seem to be filled
    correctly by e.g. MythTV.
    
    Signed-off-by: Henrik Kurelid <henrik@kurelid.se>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 096edfbf167ab277608d26ba8b7978da116a4996
Author: Henrik Kurelid <henrik@kurelid.se>
Date:   Thu Dec 4 22:40:52 2008 +0100

    firedtv: fix returned struct for ca_info
    
    The SystemId of the ca_info message was filled with garbage.
    It now returns what the card returns.
    
    Signed-off-by: Henrik Kurelid <henrik@kurelid.se>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 8ae83cdf3297d7da301af36bdb6ff45bd331c6d0
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Sun Nov 2 13:45:00 2008 +0100

    firedtv: cleanups and minor fixes
    
    Combination of the following changes:
    
    Sun, 2 Nov 2008 13:45:00 +0100 (CET)
    firedtv: increase FCP frame length for DVB-S2 tune QSPK
    
        The last three bytes didn't go out to the wire.
        Effect of the fix not yet tested.
    
    Sun, 2 Nov 2008 13:45:00 +0100 (CET)
    firedtv: replace mdelay by msleep
    
        These functions can sleep (and in fact sleep for the duration of a whole
        FCP transaction).  Hence msleep is more appropriate here.
    
    Sun, 2 Nov 2008 13:45:00 +0100 (CET)
    firedtv: trivial reorganization in avc_api
    
        Reduce nesting level by factoring code out of avc_tuner_dsd() into
        helper functions.
    
    Sun, 2 Nov 2008 13:45:00 +0100 (CET)
    firedtv: trivial cleanups in avc_api
    
        Use dev_err(), no CamelCase function names, adjust comment style, put
        #if 0 around unused code and add FIXME comments, standardize on
        lower-case hexadecimal constants, use ALIGN() for some frame length
        calculations, make a local function static...
    
        The code which writes FCP command frames and reads FCP response frames
        is not yet brought into canonical kernel coding style because this
        involves changes of typedefs (on-the-wire bitfields).
    
    Sun, 2 Nov 2008 13:45:00 +0100 (CET)
    firedtv: don't retry oPCR updates endlessly
    
        In the theoretical case that the target node wasn't handling the lock
        transactions as expected or there was continued interference by other
        initiating nodes, these functions wouldn't return for ages.
    
    Sun, 2 Nov 2008 13:45:00 +0100 (CET)
    firedtv: remove bitfield typedefs from cmp, fix for big endian CPUs
    
        Use macros/ inline functions/ standard byte order accessors to read and
        write oPCR register values (big endian bitfields, on-the-wire data).
        The new code may not be the ultimate optimum, but it doesn't occur in a
        hot path.
    
        This fixes the CMP code for big endian CPUs.  So far I tested it only on
        a little endian CPU though.
    
        For now, include <asm/byteorder.h> instead of <linux/byteorder.h>
        because drivers/ieee1394/*.h also include the former.  I will fix this
        in drivers/ieee1394 and firedtv later.
    
    Sun, 2 Nov 2008 13:45:00 +0100 (CET)
    firedtv: trivial cleanups in cmp
    
        Reduce nesting level by means of early exit and goto.
        Remove obsolete includes, use dev_err(), no CamelCase function names...
    
    Sun, 2 Nov 2008 13:45:00 +0100 (CET)
    firedtv: trivial cleanups in firesat-ci
    
        Whitespace, variable names, comment style...
    
        Also, use dvb_generic_open() and dvb_generic_release() directly as
        our hooks in struct file_operations because firedtv's wrappers merely
        called these generic functions.
    
    Sun, 2 Nov 2008 13:45:00 +0100 (CET)
    firedtv: remove CA debug code
    
        This looks like it is not necessary to have available for endusers who
        cannot patch kernels for bug reporting and tests of fixes.
    
    Sun, 2 Nov 2008 13:45:00 +0100 (CET)
    firedtv: remove AV/C debug code
    
        This looks like it is not necessary to have available for endusers who
        cannot patch kernels for bug reporting and tests of fixes.
    
    Sun, 2 Nov 2008 13:45:00 +0100 (CET)
    firedtv: remove various debug code
    
        Most of this was already commented out.  And that which wasn't is not
        relevant in normal use.
    
    Mon, 29 Sep 2008 19:22:48 +0200 (CEST)
    firedtv: register input device as child of a FireWire device
    
        Instead of one virtual input device which exists for the whole lifetime
        of the driver and receives events from all connected FireDTVs, register
        one input device for each firedtv device.  These input devices will show
        up as children of the respective firedtv devices in the sysfs hierarchy.
    
        However, the implementation falls short because of a bug in userspace:
        Udev's path_id script gets stuck with 100% CPU utilization, maybe
        because of an assumption about the maximum ieee1394 device hierarchy
        depth.
    
        To avoid this bug, we use the fw-host device instead of the proper
        unit_directory device as parent of the input device.
    
        There is hope that the port to the new firewire stack won't be inhibited
        by this userspace bug because there are no fw-host devices there.
    
    Mon, 29 Sep 2008 19:21:52 +0200 (CEST)
    firedtv: fix string comparison and a few sparse warnings
    
        Sparse found a bug:
        	while ((kv_buf + kv_len - 1) == '\0')
        should have been
        	while (kv_buf[kv_len - 1] == '\0')
        We fix it by a better implementation without a temporary copy.
    
        Also fix sparse warnings of 0 instead of NULL and signedness mismatches.
    
    Mon, 29 Sep 2008 19:21:20 +0200 (CEST)
    firedtv: remove unused struct members
    
        and redefine an int as a bool.
    
    Mon, 29 Sep 2008 19:20:36 +0200 (CEST)
    firedtv: fix initialization of dvb_frontend.ops
    
        There was a NULL pointer reference if no dvb_frontend_info was found.
    
        Also, don't directly assign struct typed values to struct typed
        variables.  Instead write out assignments to individual strcut members.
        This reduces module size by about 1 kB.
    
    Mon, 29 Sep 2008 19:19:41 +0200 (CEST)
    firedtv: remove unused dual subunit code from initialization
    
        No FireDTVs with more than one subunit exists, hence simplify the
        initialization for the special case of one subunit.  The driver was able
        to check for more than one subunit but was broken for more than two
        subunits.
    
        While we are at it, add several missing cleanups after failure, and
        include a few dynamically allocated structures diretly into struct
        firesat instead of allocating them separately.
    
    Mon, 29 Sep 2008 19:19:08 +0200 (CEST)
    firedtv: add vendor_id and version to driver match table
    
        Now that nodemgr was enhanced to match against the root directory's
        vendor ID if there isn't one in the unit directory, use this to
        prevent firedtv to be bound to wrong devices by accident.
    
        Also add the AV/C software version ID to the match flags for
        completeness; specifier ID and software only make sense as a pair.
    
    Mon, 29 Sep 2008 19:18:30 +0200 (CEST)
    firedtv: use hpsb_node_read(), _write(), _lock()
    
        because they are simpler and treat the node generation more correctly.
        While we are at it, clean up and simplify surrounding code.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 00fc3072e484c1c6fdbd9c3b1851f866000a6cb9
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Mon Feb 16 23:42:31 2009 +0100

    ieee1394: remove superfluous assertions
    
    hpsb_read, hpsb_write, hpsb_lock are sleeping functions which nobody is
    in danger to use in atomic context.  Besides, in_interrupt does not
    cover all types of atomic context.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 9c939e4df432fe4ed17bdbf7bc14111ec51ef7c9
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Wed Aug 27 01:24:25 2008 +0200

    ieee1394: inherit ud vendor_id from node vendor_id
    
    While Module_Vendor_ID in the configuration ROM's root directory is
    mandatory, there often aren't vendor IDs in unit directories.  This
    affects the new firedtv driver which is meant to be auto-loaded and
    matched only for vendor-specific devices.
    
    We now always copy ne->vendor_id into ud->vendor_id before we scan a
    unit directory (and fill in a possibly present vendor ID from there).
    This way, the root directory's vendor ID is used as fallback in the
    "uevent" environment for modprobe'ing per module alias when a node was
    plugged in, and in the driver match routine when protocol drivers are
    bound to unit directories.  It will however not be used as sysfs
    attribute of a unit directory device.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit b33fdd6ca576d6c476c6aebf350d4556294d74ac
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Wed Aug 27 13:40:02 2008 +0200

    ieee1394: add hpsb_node_read() and hpsb_node_lock()
    
    These will be used by the firedtv driver.  Like hpsb_node_write() they
    are much better APIs for high-level drivers than hpsb_write() and its
    siblings --- easier to use correctly and also terser.
    
    Unlike hspb_node_write(), the two new functions will only be used by
    one call site.  Hence make them static inline instead of exported
    symbols.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 29f8ea8ab09bad0c3c0d67964559d27643e97903
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Wed Aug 27 01:18:32 2008 +0200

    ieee1394: use correct barrier types between accesses of nodeid and generation
    
    A compiler barrier (explicit on the read side, implicit on the write
    side) is not quite enough for what has to be accomplished here.  Use
    hardware memory barriers on systems which need them.
    
    (Of course a full fix of generation handling would require much more
    than this.  The ieee1394 core's bus generation counter had to be tied to
    the controller's bus generation counter; cf. Kristian's stack.  It's
    just that I have other current business with the code around these
    barrier()s, so why not do at least this small fix.)
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 612262a53352af839a14b3395975a3440c95080a
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Tue Aug 26 00:17:30 2008 +0200

    firesat: copyrights, rename to firedtv, API conversions, fix remote control input
    
    Combination of the following changes:
    
    Tue, 26 Aug 2008 00:17:30 +0200 (CEST)
    firedtv: fix remote control input
    
        and update the scancode-to-keycode mapping to a current model.  Per
        default, various media key keycodes are emitted which closely match what
        is printed on the remote.  Userland can modify the mapping by means of
        evdev ioctls.  (Not tested.)
    
        The old scancode-to-keycode mapping is left in the driver but cannot be
        modified by ioctls.  This preserves status quo for old remotes.
    
    Tue, 26 Aug 2008 00:11:28 +0200 (CEST)
    firedtv: replace tasklet by workqueue job
    
        Non-atomic context is a lot nicer to work with.
    
    Sun, 24 Aug 2008 23:30:00 +0200 (CEST)
    firedtv: move some code back to ieee1394 core
    
        Partially reverts "ieee1394: remove unused code" of Linux 2.6.25.
    
    Sun, 24 Aug 2008 23:29:30 +0200 (CEST)
    firedtv: replace semaphore by mutex
    
        firesat->avc_sem and ->demux_sem have been used exactly like a mutex.
        The only exception is the schedule_remotecontrol tasklet which did a
        down_trylock in atomic context.  This is not possible with
        mutex_trylock; however the whole remote control related code is
        non-functional anyway at the moment.  This should be fixed eventually,
        probably by turning the tasklet into a worqueue job.
    
        Convert everything else from semaphore to mutex.
    
        Also rewrite a few of the affected functions to unlock the mutex at a
        single exit point, instead of in several branches.
    
    Sun, 24 Aug 2008 23:28:45 +0200 (CEST)
    firedtv: some header cleanups
    
        Unify #ifndef/#define/#endif guards against multiple inclusion.
        Drop extern keyword from function declarations.
        Remove #include's into header files where struct declarations suffice.
    
        Remove unused ohci1394 interface and related unused ieee1394 interfaces.
    
        Add a few missing #include's and remove a few apparently obsolete ones.
        Sort them alphabetically.
    
    Sun, 24 Aug 2008 23:27:45 +0200 (CEST)
    firedtv: nicer registration message and some initialization fixes
    
        Print the correct name in dvb_register_adapter().
    
        While we are at it, replace two switch cascades by one for loop, remove
        a superfluous member of struct firesat and of two unused arguments of
        AVCIdentifySubunit(), and fix bogus kfree's in firesat_dvbdev_init().
    
    Tue, 26 Aug 2008 14:24:17 +0200 (CEST)
    firesat: rename to firedtv
    
        Suggested by Andreas Monitzer.  Besides DVB-S/-S2 receivers, the driver
        also supports DVB-C and DVB-T receivers, hence the previous project name
        is too narrow now.
    
        Not yet done:  Rename source directory, files, types, variables...
    
    Sun, 24 Aug 2008 23:26:23 +0200 (CEST)
    firesat: add missing copyright notes
    
        Reported by Andreas Monitzer and Christian Dolzer.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 81c67b7f82769292a86b802590be5879413f9278
Author: Henrik Kurelid <henrik@kurelid.se>
Date:   Sun Aug 24 15:20:07 2008 +0200

    firesat: avc resend
    
    - Add resending of AVC message to the card if no answer is received
      - Replace the homebrewed event_wait function with a standard wait queue
      - Clean up of log/error messages
      - Increase debug level of avc communication
    
    Signed-off-by: Henrik Kurelid <henrik@kurelid.se>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit df4846c35247a0d038c5359d502cddd59d04bc40
Author: Henrik Kurelid <henke@kurelid.se>
Date:   Fri Aug 1 10:00:45 2008 +0200

    firesat: update isochronous interface, add CI support
    
    I have finally managed to get the CI support for the card working. The
    implementation is a bare minimum to get encrypted channels to work in
    kaffeine. It works fine with my T/CI card. Now and then I get an AVC
    timeout and have to retune a channel in order to get it to work. Once
    the CAM seemed to hang so I needed to remove and insert it again. I.e.
    there are a number of glitches.
    
    The latest version contains the following changes:
    
      - Implemented the new hpsb iso interface so that data can be received
        from the card
      - Reduced some timers for demux setup which caused scanning to timeout
      - Added possibility to unload driver
      - Added support for getting C/N ratio
      - Added two debug parameters to the driver; ca_debug and
        avc_comm_debug.
      - Added CI support that works for me in kaffeine
      - Started working on CI MMI support. It now supports:
          o Enter menu
          o Receiving MMI objects
      - Added support for 64-bit platforms
      - Corrected DVB-C modulations problems
    
    Signed-off-by: Henrik Kurelid <henrik@kurelid.se>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> (rebased, whitespace)

commit 2c22861459f094e899c034515a9bb92ac307ceae
Author: Ben Backx <ben@bbackx.com>
Date:   Sat Aug 9 14:35:55 2008 +0200

    firesat: add DVB-S support for DVB-S2 devices
    
    ...so S2 owners now can at least watch DVB-S channels in linux.
    
    Signed-off-by: Ben Backx <ben@bbackx.com>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit f1bbb43a667067f24a729df78dc050348b1c7846
Author: Ben Backx <ben@bbackx.com>
Date:   Sun Jun 22 16:00:53 2008 +0200

    firesat: fix DVB-S2 device recognition
    
    This only makes sure that a DVB-S2 device is really recognized as a S2,
    nothing else is added yet. It's using the string containing the model
    that is stored in the configuration ROM, the older version was using
    some hardware revision dependent part of the ROM.
    
    Signed-off-by: Ben Backx <ben@bbackx.com>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit c81c8b68b46752721b0c1addfabb828da27e1489
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Thu Mar 6 21:30:23 2008 -0800

    DVB: add firesat driver
    
    Original code written by Christian Dolzer <c.dolzer@digital-everywhere.com>
    
    Cleaned up by Greg.
    
    Major cleanup and reorg by Manu Abraham <manu@linuxtv.org>
    
    Additions also by Ben Backx <ben@bbackx.com>
    
    Cc: Christian Dolzer <c.dolzer@digital-everywhere.com>
    Cc: Andreas Monitzer <andy@monitzer.com>
    Cc: Manu Abraham <manu@linuxtv.org>
    Cc: Fabio De Lorenzo <delorenzo.fabio@gmail.com>
    Cc: Robert Berger <robert.berger@reliableembeddedsystems.com>
    Signed-off-by: Ben Backx <ben@bbackx.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    
    Added missing dependency to dvb/firesat/Kconfig,
    Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
    
    Tweaked dvb/Makefile.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit f7e603ad8f78cd3b59e33fa72707da0cbabdf699
Merge: cac7112... 50fee1d...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Feb 23 20:29:21 2009 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      net: amend the fix for SO_BSDCOMPAT gsopt infoleak
      netns: build fix for net_alloc_generic

commit cac711211a039ae2e2dc6322ffb3c2279d093bf1
Author: Krzysztof Sachanowicz <analyzer1@gmail.com>
Date:   Mon Feb 23 22:21:55 2009 +0100

    proc: proc_get_inode should de_put when inode already initialized
    
    de_get is called before every proc_get_inode, but corresponding de_put is
    called only when dropping last reference to an inode. This might cause
    something like
    remove_proc_entry: /proc/stats busy, count=14496
    to be printed to the syslog.
    
    The fix is to call de_put in case of an already initialized inode in
    proc_get_inode.
    
    Signed-off-by: Krzysztof Sachanowicz <analyzer1@gmail.com>
    Tested-by: Marcin Pilipczuk <marcin.pilipczuk@gmail.com>
    Acked-by: Al Viro <viro@ZenIV.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 226485e9a91ee89c941d8cb7714f85644a8071d0
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Mon Feb 23 15:41:09 2009 -0800

    i915: suspend/resume interrupt state
    
    In the KMS case, enter/leavevt won't fix up the interrupt handler for
    us, so we need to do it at suspend/resume time.  Make sure we don't fail
    the resume if the chip is hung either.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6c0594a306790ab03db345086c0c6c922a900bf6
Author: Karsten Wiese <fzu@wemgehoertderstaat.de>
Date:   Mon Feb 23 15:07:57 2009 +0100

    Fix an oops in i915_gem_retire_requests()
    
    dev_priv->hw_status_page can be NULL, if i915_gem_retire_requests()
    is called from i915_gem_busy_ioctl().
    
    Signed-off-by Karsten Wiese <fzu@wemgehoertderstaat.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 50fee1dec5d71b8a14c1b82f2f42e16adc227f8b
Author: Eugene Teo <eugeneteo@kernel.sg>
Date:   Mon Feb 23 15:38:41 2009 -0800

    net: amend the fix for SO_BSDCOMPAT gsopt infoleak
    
    The fix for CVE-2009-0676 (upstream commit df0bca04) is incomplete. Note
    that the same problem of leaking kernel memory will reappear if someone
    on some architecture uses struct timeval with some internal padding (for
    example tv_sec 64-bit and tv_usec 32-bit) --- then, you are going to
    leak the padded bytes to userspace.
    
    Signed-off-by: Eugene Teo <eugeneteo@kernel.sg>
    Reported-by: Mikulas Patocka <mpatocka@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ebe47d47b7b7fed72dabcce4717da727b4e2367d
Author: Clemens Noss <cnoss@gmx.de>
Date:   Mon Feb 23 15:37:35 2009 -0800

    netns: build fix for net_alloc_generic
    
    net_alloc_generic was defined in #ifdef CONFIG_NET_NS, but used
    unconditionally. Move net_alloc_generic out of #ifdef.
    
    Signed-off-by: Clemens Noss <cnoss@gmx.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ea5a42c22ee123dfc8fa34c421cf95d6235e54d9
Merge: d38e84e... bb402f1...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Feb 23 14:38:20 2009 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      crypto: ahash - Fix digest size in /proc/crypto

commit d38e84ee39783e00bd0b83a8dd19e54709950912
Merge: 20f4d6c... 486a87f...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Feb 23 14:36:05 2009 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      netns: fix double free at netns creation
      veth : add the set_mac_address capability
      sunlance: Beyond ARRAY_SIZE of ib->btx_ring
      sungem: another error printed one too early
      ISDN: fix sc/shmem printk format warning
      SMSC: timeout reaches -1
      smsc9420: handle magic field of ethtool_eeprom
      sundance: missing parentheses?
      smsc9420: fix another postfixed timeout
      wimax/i2400m: driver loads firmware v1.4 instead of v1.3
      vlan: Update skb->mac_header in __vlan_put_tag().
      cxgb3: Add support for PCI ID 0x35.
      tcp: remove obsoleted comment about different passes
      TG3: &&/|| confusion
      ATM: misplaced parentheses?
      net/mv643xx: don't disable the mib timer too early and lock properly
      net/mv643xx: use GFP_ATOMIC while atomic
      atl1c: Atheros L1C Gigabit Ethernet driver
      net: Kill skb_truesize_check(), it only catches false-positives.
      net: forcedeth: Fix wake-on-lan regression

commit ebd3610b110bbb18ea6f9f2aeed1e1068c537227
Author: Jan Kara <jack@suse.cz>
Date:   Sun Feb 22 21:09:59 2009 -0500

    ext4: Fix deadlock in ext4_write_begin() and ext4_da_write_begin()
    
    Functions ext4_write_begin() and ext4_da_write_begin() call
    grab_cache_page_write_begin() without AOP_FLAG_NOFS. Thus it
    can happen that page reclaim is triggered in that function
    and it recurses back into the filesystem (or some other filesystem).
    But this can lead to various problems as a transaction is already
    started at that point. Add the necessary flag.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=11688
    
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

commit 486a87f1e5624096bd1c09e9e716239597d48dca
Author: Daniel Lezcano <daniel.lezcano@free.fr>
Date:   Sun Feb 22 00:07:53 2009 -0800

    netns: fix double free at netns creation
    
    This patch fix a double free when a network namespace fails.
    The previous code does a kfree of the net_generic structure when
    one of the init subsystem initialization fails.
    The 'setup_net' function does kfree(ng) and returns an error.
    The caller, 'copy_net_ns', call net_free on error, and this one
    calls kfree(net->gen), making this pointer freed twice.
    
    This patch make the code symetric, the net_alloc does the net_generic
    allocation and the net_free frees the net_generic.
    
    Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ee923623177249cf22c43419ad0e8ff926dd1f58
Author: Daniel Lezcano <daniel.lezcano@free.fr>
Date:   Sun Feb 22 00:04:45 2009 -0800

    veth : add the set_mac_address capability
    
    Fix lost set_mac_address capability.
    
    Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b956d41162b1f2c4b446107e9910e4719cbc75f4
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Sat Feb 21 23:46:36 2009 -0800

    sunlance: Beyond ARRAY_SIZE of ib->btx_ring
    
    Do not go beyond ARRAY_SIZE of ib->btx_ring
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 05bf9e839d9de4e8a094274a0a2fd07beb47eaf1
Author: Theodore Ts'o <tytso@mit.edu>
Date:   Sat Feb 21 12:13:24 2009 -0500

    ext4: Add fallback for find_group_flex
    
    This is a workaround for find_group_flex() which badly needs to be
    replaced.  One of its problems (besides ignoring the Orlov algorithm)
    is that it is a bit hyperactive about returning failure under
    suspicious circumstances.  This can lead to spurious ENOSPC failures
    even when there are inodes still available.
    
    Work around this for now by retrying the search using
    find_group_other() if find_group_flex() returns -1.  If
    find_group_other() succeeds when find_group_flex() has failed, log a
    warning message.
    
    A better block/inode allocator that will fix this problem for real has
    been queued up for the next merge window.
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

commit d13c11f6f7324b4fe61720910ee54184c38d2fea
Author: roel kluin <roel.kluin@gmail.com>
Date:   Mon Feb 16 04:02:04 2009 +0000

    sungem: another error printed one too early
    
    Another error was printed one too early.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0d5048a96fc51d976ac777e3d78762b4dd241693
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Fri Feb 20 00:54:44 2009 -0800

    ISDN: fix sc/shmem printk format warning
    
    Fix isdn/sc/shmem.c printk format warning:
    
    drivers/isdn/sc/shmem.c:57: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 2cf0dbed27af3f827a96db98c2535002902f6af0
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Fri Feb 20 00:52:19 2009 -0800

    SMSC: timeout reaches -1
    
    With a postfix decrement timeouts will reach -1 rather than 0, so
    the error path does not appear.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 196b7e1b9cca9e187bb61fa7d60f04f4ab2c0592
Author: Steve Glendinning <steve.glendinning@smsc.com>
Date:   Sun Feb 15 22:55:01 2009 +0000

    smsc9420: handle magic field of ethtool_eeprom
    
    ethtool.h says the driver should set the magic field in get_eeprom and
    verify it in set_eeprom.  This patch adds this functionality using an
    arbitary driver-specific magic value constant (0x9420).
    
    Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 62660e28084df3d8067ab855f326d3027808c569
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Wed Feb 18 10:19:50 2009 +0100

    sundance: missing parentheses?
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 9df8f4e3ee760c14211a5f484e9ee4f0bc0c566b
Author: Steve Glendinning <steve.glendinning@smsc.com>
Date:   Mon Feb 16 07:46:06 2009 +0000

    smsc9420: fix another postfixed timeout
    
    Roel Kluin recently fixed several instances where variables reach -1,
    but 0 is tested afterwards.  This patch fixes another, so the timeout
    will be correctly detected and a warning printed.
    
    Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 494ef10ebacc23679350a17483879366d8bafebd
Author: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Date:   Thu Feb 19 14:40:29 2009 -0800

    wimax/i2400m: driver loads firmware v1.4 instead of v1.3
    
    This is a one liner change to have the driver use by default the v1.4
    of the i2400m firmware instead of v1.3. The v1.4 version of the
    firmware has been submitted to David Woodhouse for inclusion in the
    linux-firmware tree and it is already available at
    http://linuxwimax.org/Download.
    
    The reason for this change is that the 1.3 release of the user space
    software and firmware has a few issues that will make it difficult to
    use with currently deployed commercial networks such as Xohm and
    Clearwire.
    
    As well, the new 1.4 release of the user space software (which matches
    the 1.4 firmware) has intermitent issues with the 1.3 firmware.
    
    The 1.4 release in http://linuxwimax.org/Download has been widely
    deployed and tested with the codebase in 2.6.29-rc, the 1.4 firmware
    and the 1.4 user space components.
    
    We understand it is quite late in the rc process for such a change,
    but would like to ask for the change to be taken into consideration.
    
    Alternatively, a user could always force feed a 1.4 firmware into a
    driver that doesn't have this modification by:
    
    $ cd /lib/firmware
    $ mv i2400m-fw-usb-1.3.sbcf i2400m-fw-usb-1.3.real.sbcf
    $ ln -sf i2400m-fw-usb-1.4.sbc i2400m-fw-usb-1.3.sbcf
    
    Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit e4dd61882e2cfe47ea72ecd825671e8e5ae29038
Author: Jarek Poplawski <jarkao2@gmail.com>
Date:   Wed Feb 18 23:31:11 2009 -0800

    vlan: Update skb->mac_header in __vlan_put_tag().
    
    After moving mac addresses in __vlan_put_tag() skb->mac_header needs
    to be updated.
    
    Reported-by: Karl Hiramoto <karl@hiramoto.org>
    Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit bb402f16ecf9bcdb944b8fa730f0e43cae519673
Author: Lee Nipper <lee.nipper@freescale.com>
Date:   Thu Feb 19 14:46:26 2009 +0800

    crypto: ahash - Fix digest size in /proc/crypto
    
    crypto_ahash_show changed to use cra_ahash for digestsize reference.
    
    Signed-off-by: Lee Nipper <lee.nipper@freescale.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

commit ce03aaddd4d67371494b36c8e8a57bc789e934d6
Author: Divy Le Ray <divy@chelsio.com>
Date:   Wed Feb 18 17:47:57 2009 -0800

    cxgb3: Add support for PCI ID 0x35.
    
    Add support for adapters with a PCI id equal to 0x35.
    
    Signed-off-by: Divy Le Ray <divy@chelsio.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 5209921cf15452cbe43097afce11d2846630cb51
Author: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date:   Wed Feb 18 17:45:44 2009 -0800

    tcp: remove obsoleted comment about different passes
    
    This is obsolete since the passes got combined.
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f72b534961ac38dde17824d7693292eeaadf10e8
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Wed Feb 18 17:42:42 2009 -0800

    TG3: &&/|| confusion
    
    phyid Can't be both TG3_PHY_OUI_1 and TG3_PHY_OUI_2 and TG3_PHY_OUI_3.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Acked-by: Matt Carlson <mcarlson@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 858671f80ae5db68d6bcd2c6d3a13e366040ba9b
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Wed Feb 18 17:41:38 2009 -0800

    ATM: misplaced parentheses?
    
    Add missing parentheses
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 57e8f26a10ac4af488292199bb0435555f6723f3
Author: Sebastian Siewior <sebastian@breakpoint.cc>
Date:   Mon Feb 16 11:28:15 2009 +0000

    net/mv643xx: don't disable the mib timer too early and lock properly
    
    mib_counters_update() also restarts the timer.
    So the timer is dequeued, the stats are read and then the timer is
    enqueued again. This is "okay" unless someone unloads the module.
    The locking here is also broken:
    mib_counters_update() grabs just a simple spinlock. The only thing the
    lock is good for is to protect the timer func against other callers
    namely mv643xx_eth_stop() && mv643xx_eth_get_ethtool_stats(). That means
    if the spinlock is taken via the ethtool path and than the timer kicks
    in then the box will lock up.
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
    Acked-by: Lennert Buytenhek <buytenh@marvell.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 82a5bd6a7b1b60b5d357e2e4b93b914f57314016
Author: Sebastian Siewior <sebastian@breakpoint.cc>
Date:   Sat Feb 14 23:26:18 2009 +0000

    net/mv643xx: use GFP_ATOMIC while atomic
    
    dev_set_rx_mode() grabs netif_addr_lock_bh():
    
    |BUG: sleeping function called from invalid context at /home/bigeasy/git/cryptodev-2.6/mm/slub.c:1599
    |in_atomic(): 1, irqs_disabled(): 0, pid: 859, name: ifconfig
    |2 locks held by ifconfig/859:
    | #0:  (rtnl_mutex){--..}, at: [<c0239ccc>] rtnl_lock+0x18/0x20
    | #1:  (_xmit_ETHER){-...}, at: [<c022d094>] dev_set_rx_mode+0x1c/0x30
    |[<c029f118>] (dump_stack+0x0/0x14) from [<c003df28>] (__might_sleep+0x11c/0x13c)
    |[<c003de0c>] (__might_sleep+0x0/0x13c) from [<c00a8854>] (kmem_cache_alloc+0x30/0xd4)
    | r5:c78093a0 r4:c034a47c
    |[<c00a8824>] (kmem_cache_alloc+0x0/0xd4) from [<c01a5fd0>] (mv643xx_eth_set_rx_mode+0x70/0x188)
    |[<c01a5f60>] (mv643xx_eth_set_rx_mode+0x0/0x188) from [<c022ced0>] (__dev_set_rx_mode+0x40/0xac)
    |[<c022ce90>] (__dev_set_rx_mode+0x0/0xac) from [<c022d09c>] (dev_set_rx_mode+0x24/0x30)
    | r6:00001043 r5:c78090f8 r4:c7809000
    |[<c022d078>] (dev_set_rx_mode+0x0/0x30) from [<c02304c4>] (dev_open+0xe4/0x114)
    | r5:c7809350 r4:c7809000
    |[<c02303e0>] (dev_open+0x0/0x114) from [<c022fd18>] (dev_change_flags+0xb0/0x190)
    | r5:00000041 r4:c7809000
    |[<c022fc68>] (dev_change_flags+0x0/0x190) from [<c0270250>] (devinet_ioctl+0x2f0/0x710)
    | r7:c7221e70 r6:c7aadb00 r5:00000000 r4:00000001
    |[<c026ff60>] (devinet_ioctl+0x0/0x710) from [<c02717c8>] (inet_ioctl+0xd4/0x110)
    |[<c02716f4>] (inet_ioctl+0x0/0x110) from [<c021fb74>] (sock_ioctl+0x1f4/0x254)
    | r4:c7242b40
    |[<c021f980>] (sock_ioctl+0x0/0x254) from [<c00b8160>] (vfs_ioctl+0x38/0x98)
    | r6:beec9bb8 r5:00008914 r4:c7242b40
    |[<c00b8128>] (vfs_ioctl+0x0/0x98) from [<c00b873c>] (do_vfs_ioctl+0x484/0x4d4)
    | r6:00008914 r5:c7242b40 r4:c74db1c0
    |[<c00b82b8>] (do_vfs_ioctl+0x0/0x4d4) from [<c00b87cc>] (sys_ioctl+0x40/0x64)
    |[<c00b878c>] (sys_ioctl+0x0/0x64) from [<c00269a0>] (ret_fast_syscall+0x0/0x2c)
    |[42949399.520000]  r7:00000036 r6:beec9c80 r5:00000041 r4:beec9bb8
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
    Acked-by: Lennert Buytenhek <buytenh@marvell.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 43250ddd75a35d1f7926d989a10fefd30c37eaa7
Author: Jie Yang <jie.yang@atheros.com>
Date:   Wed Feb 18 17:24:15 2009 -0800

    atl1c: Atheros L1C Gigabit Ethernet driver
    
    Supporting AR8131, and AR8132.
    
    Signed-off-by: Jie Yang <jie.yang@atheros.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 92a0acce186cde8ead56c6915d9479773673ea1a
Author: David S. Miller <davem@davemloft.net>
Date:   Tue Feb 17 21:24:05 2009 -0800

    net: Kill skb_truesize_check(), it only catches false-positives.
    
    A long time ago we had bugs, primarily in TCP, where we would modify
    skb->truesize (for TSO queue collapsing) in ways which would corrupt
    the socket memory accounting.
    
    skb_truesize_check() was added in order to try and catch this error
    more systematically.
    
    However this debugging check has morphed into a Frankenstein of sorts
    and these days it does nothing other than catch false-positives.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 34edaa88324004baf4884fb0388f86059d9c4878
Author: Tobias Diedrich <ranma+kernel@tdiedrich.de>
Date:   Mon Feb 16 00:13:20 2009 -0800

    net: forcedeth: Fix wake-on-lan regression
    
    Commit f55c21fd9a92a444e55ad1ca4e4732d56661bf2e ("forcedeth: call
    restore mac addr in nv_shutdown path"), which was introduced to fix
    the regression tracked at
    http://bugzilla.kernel.org/show_bug.cgi?id=11358 causes the
    wake-on-lan mac to be reversed in the shutdown path.  Apparently the
    forcedeth situation is rather messy in that the mac we need to
    writeback for a subsequent modprobe to work is exactly the reverse of
    what is needed for proper wake-on-lan.
    
    The following patch explains the situation in the comments and
    makes the call to nv_restore_mac_addr() conditional (only called if
    we are not really going for poweroff).
    
    Tobias Diedrich wrote:
    > Hmm, I had not tried WOL for some time.
    > With 2.6.29-rc3 is see the following behaviour:
    >
    > State            WOL Behaviour
    > ------------------------------
    > shutdown         reversed MAC
    > disk/shutdown    reversed MAC
    > disk/platform    OK
    >
    > Apparently nv_restore_mac_addr() restores the MAC in the wrong order
    > for WOL (at least for my PCI_DEVICE_ID_NVIDIA_NVENET_15).  platform
    > works, because the MAC is not touched in the nv_suspend() path.
    >
    > A possible fix might be to only call nv_restore_mac_addr() if
    > system_state != SYSTEM_POWER_OFF.
    
    With the following patch:
    shutdown         OK
    disk/shutdown    OK
    disk/platform    OK
    kexec            OK
    
    Signed-off-by: Tobias Diedrich <ranma+kernel@tdiedrich.de>
    Tested-by: Philipp Matthias Hahn <pmhahn@titan.lahn.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>