Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1206511 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-08-13 07:00 +0200 |
| Last post | 2015-08-13 17:40 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the staging tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-13 07:00 +0200
Re: linux-next: manual merge of the staging tree with the tip tree Greg KH <greg@kroah.com> - 2015-08-13 17:40 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-08-13 07:00 +0200 |
| Subject | linux-next: manual merge of the staging tree with the tip tree |
| Message-ID | <pWSMq-1pC-7@gated-at.bofh.it> |
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/ozwpan/ozproto.c
between commit:
5a447f09a8df ("staging: ozwpan: Fix hrtimer wreckage")
from the tip tree and commit:
a73e99cb67e7 ("staging: ozwpan: Remove from tree")
from the staging tree.
I fixed it up (I just removed the file) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Greg KH <greg@kroah.com> |
|---|---|
| Date | 2015-08-13 17:40 +0200 |
| Message-ID | <pX2LM-7qM-13@gated-at.bofh.it> |
| In reply to | #1206511 |
On Thu, Aug 13, 2015 at 02:55:35PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/ozwpan/ozproto.c
>
> between commit:
>
> 5a447f09a8df ("staging: ozwpan: Fix hrtimer wreckage")
>
> from the tip tree and commit:
>
> a73e99cb67e7 ("staging: ozwpan: Remove from tree")
>
> from the staging tree.
>
> I fixed it up (I just removed the file) and can carry the fix as necessary
> (no action is required).
Sounds good to me, thanks.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web