[lkml]   [2012]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the wireless-next tree with the net-next tree
    On 01/04/2012 09:04 PM, Stephen Rothwell wrote:
    > Hi John,
    > Today's linux-next merge of the wireless-next tree got a conflict in
    > drivers/net/wireless/b43legacy/dma.c between commit 3db1cd5c05f3 ("net:
    > fix assignment of 0/1 to bool variables") from the net-next tree and
    > commit 5d07a3d62f63 ("b43legacy: Avoid packet losses in the dma worker
    > code") from the wireless-next tree.
    > Just context changes. I fixed it up (see below) and can carry the fix as
    > necessary.

    Is there a good explanation why changes in wireless drivers are sent to
    net-next, and not wireless-testing? If that were stopped, this kind of conflict
    would be avoided.


     \ /
      Last update: 2012-01-05 04:15    [W:0.036 / U:0.276 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site