From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@elte•hu>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Jason A. Donenfeld" <Jason@zx2c4•com>
Subject: linux-next: manual merge of the staging tree with the tip tree
Date: Thu, 13 Aug 2015 14:55:35 +1000 [thread overview]
Message-ID: <20150813145535.6db96f9f@canb.auug.org.au> (raw)
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
next reply other threads:[~2015-08-13 4:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-13 4:55 Stephen Rothwell [this message]
2015-08-13 15:34 ` linux-next: manual merge of the staging tree with the tip tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2016-03-02 3:35 Stephen Rothwell
2016-03-02 7:54 ` Thomas Gleixner
2016-03-02 17:43 ` Greg KH
2016-03-02 17:53 ` Jose Rivera
2011-10-12 5:34 Stephen Rothwell
2011-10-12 14:53 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150813145535.6db96f9f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jason@zx2c4$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox