lkml.org 
[lkml]   [2012]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the akpm tree with the tip tree
    Hi Andrew,

    Today's linux-next merge of the akpm tree got a conflict in
    kernel/irq/manage.c between commit b4bc724e82e8 ("genirq: Handle pending
    irqs in irq_startup()") from the tip tree and commit "irqs: fix handling
    of pending IRQs at request time" from the akpm tree.

    It looks like the former is a superset of the latter, so I dropped the
    latter.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-02-27 06:27    [W:0.018 / U:2.072 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site