[lkml]   [2011]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the kbuild tree with the hwmon-staging tree
    On 18.3.2011 01:48, Stephen Rothwell wrote:
    > Hi Michal,
    > Today's linux-next merge of the kbuild tree got a conflict in
    > drivers/hwmon/Makefile between commit 442aba78728e ("hwmon: PMBus device
    > driver") from the hwmon-staging tree and commit 5c39e31195f4 ("hwmon:
    > change to new flag variable") from the kbuild tree.
    > Just context changes. I fixed it up (see below) and can carry the fix as
    > necessary.

    I am aware of the conflict, but as you say, it is just changed context.


     \ /
      Last update: 2011-03-18 12:25    [W:0.018 / U:1.160 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site