linux-next: manual merge of the staging tree with the tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: linux-next: manual merge of the staging tree with the tree
From: Mark Brown <broonie@xxxxxxxxxx>
Date: Wed, 2 Dec 2015 20:17:43 +0000
Cc: linux-next@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rtl8188eu/include/phy.h between Linus' tree and commit
"staging: rtl8188eu: using unique names is good" from the staging tree.

It looks like the patch is already applied so I skipped it.

Attachment: pgpRPRqGua4N7.pgp
Description: PGP signature

Follow-Ups:
- Re: linux-next: manual merge of the staging tree with the tree
  - From: Greg KH

Prev by Date: Re: linux-next: build failure after merge of the modules tree
Next by Date: Re: linux-next: build failure after merge of the block tree
Previous by thread: Re: linux-next: manual merge of the staging tree with the tree
Next by thread: Re: linux-next: manual merge of the staging tree with the tree
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel] [Linux USB Development] [Yosemite News] [Linux SCSI]

Powered by Linux