From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alexey Khoroshilov <khoroshilov@ispras.ru>,
Jiri Slaby <jslaby@suse.cz>, Joe Perches <joe@perches.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the tty tree
Date: Mon, 11 Feb 2013 06:37:00 -0800 [thread overview]
Message-ID: <20130211143700.GB1017@kroah.com> (raw)
In-Reply-To: <20130211163714.289cb3288ed5098c7b493af3@canb.auug.org.au>
On Mon, Feb 11, 2013 at 04:37:14PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/char/pcmcia/synclink_cs.c between commits 2e124b4a390c ("TTY:
> switch tty_flip_buffer_push") and 9fe8074b82ed ("TTY: synclink: Convert + to
> | for bit operations") from the tty tree and commit 3d55399391c8 ("pcmcia: synclink_cs: cleanup checkpatch warnings") from the char-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Fix looks good, thanks.
greg k-h
next prev parent reply other threads:[~2013-02-11 14:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-11 5:37 linux-next: manual merge of the char-misc tree with the tty tree Stephen Rothwell
2013-02-11 14:37 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-29 4:53 Stephen Rothwell
2021-01-29 7:34 ` Greg KH
2021-02-14 22:03 ` Stephen Rothwell
2013-01-17 2:54 Stephen Rothwell
2013-01-17 9:40 ` Samuel Iglesias Gonsalvez
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=20130211143700.GB1017@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=joe@perches.com \
--cc=jslaby@suse.cz \
--cc=khoroshilov@ispras.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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.