Re: bfsort whitelist patch apparently applied twice

[Jesse Barnes]

On Monday, July 07, 2008 7:35 am Tony Camuso wrote:
> In the most recent pull from Linus' tree, I see that the patch
> I submitted on 14-May-2008 was merged twice in the git log.
>
>   commits: a16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64
>       and: a1676072558854b95336c8f7db76b0504e909a0a
>
> The result is that now the DL360 and DL380 are whitelisted twice
> and the DL385 G2 and DL585 G2 are not whitelisted at all!
>
> Can one of these redundant commits be backed out?

Hm, seems like this should have created a conflict since there was some actual
context (#ifdef __i386__) in the patch?  Ah I see, it looks like the one that
came in through Ingo & Thomas, a1676072558854b95336c8f7db76b0504e909a0a,
modified the end of the list, while the one that I sent upstream,
8d64c781f0c5fbfdf8016bd1634506ff2ad1376a, modified the entry above #ifdef
__i386__.  That's unfortunate.

Here's what I've got, look ok?

Thanks,
Jesse