From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: Re: linux-next: manual merge of the staging tree with the tip tree
Date: Thu, 13 Aug 2015 08:34:33 -0700 [thread overview]
Message-ID: <20150813153433.GA1749@kroah.com> (raw)
In-Reply-To: <20150813145535.6db96f9f@canb.auug.org.au>
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
next prev parent reply other threads:[~2015-08-13 15:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-13 4:55 linux-next: manual merge of the staging tree with the tip tree Stephen Rothwell
2015-08-13 15:34 ` Greg KH [this message]
-- 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=20150813153433.GA1749@kroah.com \
--to=greg@kroah.com \
--cc=Jason@zx2c4.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.