[lkml]   [2012]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the sound-asoc tree with the regmap tree
    On Thursday 10 May 2012 09:55 AM, Stephen Rothwell wrote:
    > * PGP Signed by an unknown key
    > Hi all,
    > Today's linux-next merge of the sound-asoc tree got a conflict in
    > drivers/base/regmap/regmap.c between commit 6560ffd1ccd6 ("regmap: fix
    > possible memory corruption in regmap_bulk_read()") from the regmap tree
    > and commit edc9ae420f98 ("regmap: implement register striding") from the
    > sound-asoc tree.
    > I fixed it up (see below) and can carry the fix as necessary.
    The change looks fine to me.

     \ /
      Last update: 2012-05-10 07:22    [W:0.021 / U:335.400 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site