linux-kernel - Re: [GIT PATCH] TTY/serial merge for .38

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 7 Jan 2011 15:41:49 -0800
From:	Greg KH <gregkh@...e.de>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Daniel Hellstrom <daniel@...sler.com>,
	"David S. Miller" <davem@...emloft.net>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>,
	Andrew Morton <akpm@...ux-foundation.org>,
	linux-kernel@...r.kernel.org, Alan Cox <alan@...rguk.ukuu.org.uk>,
	Kay Sievers <kay.sievers@...y.org>
Subject: Re: [GIT PATCH] TTY/serial merge for .38

On Fri, Jan 07, 2011 at 02:44:14PM -0800, Linus Torvalds wrote:
> On Thu, Jan 6, 2011 at 1:54 PM, Greg KH <gregkh@...e.de> wrote:
> > Here is the big tty and serial merge for .38.  I'll be sending another
> > smaller one that just moves drivers around after .38-rc1 is out, as is
> > the norm for file moves to handle issues with other trees syncing up
> > properly.
> 
> Merged. However, the drivers/serial/apbuart.c file conflicted, and
> both sides of the merge had some insanity in them.
> 
> So I did an "evil merge" - a merge that actually changed the code to
> match neither side - and it looks better to me. But maybe that's just
> the drugs I'm taking talking.
> 
> So people should check it out. In particular, look at the interaction
> of "drivers: serial: apbuart: Handle OF failures gracefully" and the
> "Added support for ampopts in APBUART driver. Used in AMP systems"
> commit.

The merge looks ok to me, but I don't have this hardware, so I can't
test it.  Thomas, can you verify this is ok?

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/