From: Greg KH <greg@kroah.com>
To: Tomas Winkler <tomasw@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Arnd Bergmann <arnd@arndb.de>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the char-misc tree with Linus' tree
Date: Mon, 29 Jul 2013 15:25:12 -0700 [thread overview]
Message-ID: <20130729222512.GA4391@kroah.com> (raw)
In-Reply-To: <CA+i0qc7+Q416voe3sQLd3WUbu2kWRcduw9ayVq9+R+eL4zPEbA@mail.gmail.com>
On Tue, Jul 30, 2013 at 01:16:38AM +0300, Tomas Winkler wrote:
> >> (Unrelated white space changes are a pest :-()
> >>
> >> I fixed it up (see below) and can carry the fix as necessary (no action
> >> is required).
> >
> > Thanks, I've merged the char-misc-next branch into 3.11-rc3, so this
> > merge problem should no longer be there.
>
> I've preferred the blank line there as these ifs became a bit dense
> nevertheless thanks for taking care of it.
Ah, sorry about that, feel free to change it back in the next round of
patches you send :)
greg k-h
next prev parent reply other threads:[~2013-07-29 22:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-29 5:01 linux-next: manual merge of the char-misc tree with Linus' tree Stephen Rothwell
2013-07-29 19:26 ` Greg KH
2013-07-29 22:16 ` Tomas Winkler
2013-07-29 22:25 ` Greg KH [this message]
2013-07-30 0:27 ` Stephen Rothwell
2013-07-30 1:38 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2020-07-27 7:46 Stephen Rothwell
2020-07-27 7:56 Stephen Rothwell
2021-08-27 6:49 Stephen Rothwell
2021-08-27 13:12 ` Greg KH
2021-08-27 16:24 ` Kalle Valo
2021-08-27 17:55 ` Manivannan Sadhasivam
2021-08-27 17:58 ` Manivannan Sadhasivam
2021-08-27 19:28 ` Greg KH
2021-08-28 7:27 ` Kalle Valo
2021-08-28 7:50 ` Greg KH
2021-08-28 9:51 ` Manivannan Sadhasivam
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=20130729222512.GA4391@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tomasw@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).