linux-kernel - Re: [PATCH 15/61] net: struct device - replace bus_id with dev_name(), dev_set

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <ac3eb2510903250234r3d648b94xb34e5b0f3b34ef6d@mail.gmail.com>
Date:	Wed, 25 Mar 2009 10:34:53 +0100
From:	Kay Sievers <kay.sievers@...y.org>
To:	David Miller <davem@...emloft.net>
Cc:	gregkh@...e.de, linux-kernel@...r.kernel.org,
	netdev@...r.kernel.org
Subject: Re: [PATCH 15/61] net: struct device - replace bus_id with 
	dev_name(), dev_set_name()

On Wed, Mar 25, 2009 at 07:29, David Miller <davem@...emloft.net> wrote:
> From: Greg Kroah-Hartman <gregkh@...e.de>
> Date: Tue, 24 Mar 2009 17:26:19 -0700
>
>> From: Kay Sievers <kay.sievers@...y.org>
>>
>> Cc: davem@...emloft.net
>> Cc: netdev@...r.kernel.org
>> Acked-by: Greg Kroah-Hartman <gregkh@...e.de>
>> Signed-off-by: Kay Sievers <kay.sievers@...y.org>
>
> None of this patch applies to net-next-2.6
>
> Probably because, just like the wimax case, these changes
> are already there.

Yeah, I think -next handles duplicate and completely indentical
patches from differnt trees just fine, so that all has been in -next
for a while, and while it was still in Greg's tree when the other tree
merged it.

This patch is in your -next tree:
  http://git.kernel.org/?p=linux/kernel/git/davem/net-next-2.6.git;a=commit;h=db1d7bf70f42124f73675fca62fe32f3ab1111b4

The problem with -next is that if some tree is dropped because of a
non-trivial conflict, and Greg removes merged patches, later patches
in Greg's tree may fail because of missing changes. Maybe we need some
kind of annotation with the -next logic to handle such cases better?

Thanks,
Kay
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/