Re: fcoe: correct checking for bonding

James Bottomley
2011-03-14T20:53:35Z

On Mon, 2011-03-14 at 13:20 -0700, David Miller wrote:
> From: Jiri Pirko <jpirko@redhat.com>
> Date: Mon, 14 Mar 2011 20:22:02 +0100
> > Mon, Mar 14, 2011 at 08:04:07PM CET, robert.w.love@intel.com wrote:
> >> Taking a patch like this through net{-next} could cause a merge
> >>problem at Linus' level if a later patch makes it though the normal
> >>process and conflicts. This is what I want to avoid.
> >>
> >> This patch, although appreciated, isn't critical. I have collected it
> >>into my tree and will re-post it to scsi-misc. I see no reason to treat
> >>this patch differently from other patches.
> >
> > Well I have another set of patches dependent on this one :(
>
> True, also I think Rob is overreacting.
>
> Any merge problems created will be handled properly by Linus.
>
> I recently changed the interface to ipv4 and ipv6 route lookups, and
> this required all kinds of changes to stuff under Infiniband and elsewhere.
> It's the only sane way to handle this kind of thing.

What Rob means is that fcoe has been in pretty heavy flux and so
parallel patches can often cause non trivial merge nasties because of
code motion. That said, I think we're pretty close to the end of the
patch series for the merge window and it's a simple patch, so as long as
it applies to net-next, I think we have an pretty low probability for
non trivial merges. You can do it with my and Rob's acked-by.

James