[linux-next: manual merge of the char-misc tree with the lightnvm tree] On
22/11/2016 (Tue 18:29) Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/lightnvm/core.c
>
> between commit:
>
>
On 11/22/2016 08:29 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/lightnvm/core.c
>
> between commit:
>
> 7b0d392f6957 ("lightnvm: remove sysfs configuration interface")
>
> from the lightnvm tree and commit:
>
>
On Tue, Nov 22, 2016 at 06:29:08PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/lightnvm/core.c
>
> between commit:
>
> 7b0d392f6957 ("lightnvm: remove sysfs configuration interface")
>
> from the lightnvm tree a
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/lightnvm/core.c
between commit:
7b0d392f6957 ("lightnvm: remove sysfs configuration interface")
from the lightnvm tree and commit:
389b2a1c0e90 ("lightnvm: make core.c explicitly non-modular")
from the ch
4 matches
Mail list logo