On Thu, Jul 10, 2014 at 5:14 PM, Greg Kroah-Hartman
wrote:
>> > What tree/version is this against? I get merge issues with my
>> > driver-core-next tree :(
>>
>> Ah, I hadn't merged in your driver-core-next tree.
>> Shall I update and resend?
>
> Yes, please do.
Should have been arrived in your
On Thu, Jul 10, 2014 at 09:34:33AM +0200, Geert Uytterhoeven wrote:
> Hi Greg,
>
> On Thu, Jul 10, 2014 at 1:32 AM, Greg Kroah-Hartman
> wrote:
> > On Wed, Jul 09, 2014 at 05:26:18PM +0200, Geert Uytterhoeven wrote:
> >> Sort the list of managed interfaces and their lists of methods
> >> alphabet
Hi Greg,
On Thu, Jul 10, 2014 at 1:32 AM, Greg Kroah-Hartman
wrote:
> On Wed, Jul 09, 2014 at 05:26:18PM +0200, Geert Uytterhoeven wrote:
>> Sort the list of managed interfaces and their lists of methods
>> alphabetically, to reduce the risk of merge conflicts and duplicates.
>>
>> Signed-off-by:
On Wed, Jul 09, 2014 at 05:26:18PM +0200, Geert Uytterhoeven wrote:
> Sort the list of managed interfaces and their lists of methods
> alphabetically, to reduce the risk of merge conflicts and duplicates.
>
> Signed-off-by: Geert Uytterhoeven
> ---
> I got annoyed by the merge conflicts when merg
Sort the list of managed interfaces and their lists of methods
alphabetically, to reduce the risk of merge conflicts and duplicates.
Signed-off-by: Geert Uytterhoeven
---
I got annoyed by the merge conflicts when merging several for-next
branches a while ago, so I sorted the list after everything
5 matches
Mail list logo