linux-kernel - Re: linux-next: bad merge in driver-core.current tree

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] [day] [month] [year] [list]

Message-ID: <20130104000845.GA27734@kroah.com>
Date:	Thu, 3 Jan 2013 16:08:45 -0800
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Linus <torvalds@...ux-foundation.org>,
	Andrew Morton <akpm@...ux-foundation.org>,
	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
	Bill Pemberton <wfp5p@...ginia.edu>
Subject: Re: linux-next: bad merge in driver-core.current tree

On Fri, Jan 04, 2013 at 10:05:40AM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Happy New year!  ;-)
> 
> Today you added a merge of v3.8-rc2 to the driver-core.current tree.  It
> added the file drivers/i2c/Module.symvers which is a generated file :-(

Yeah, I realized that after sending it to Linus :(

> Please consider rebuilding your tree to get rid of it.

It's now rebuilt.

> Also, you might consider removing all the patches that remove the
> __dev* stuff as they are really not urgent, cause many conflicts (and
> will continue to do so) and most (if not all) are not acked by the
> maintainers of the subsystems that they should be applied to (did you
> send your revised versions of Bill's patches to those maintainers?).
> You might consider sending separate patches to fix the coding style
> problems after Bill's patches rather than modifying Bill's patches as
> some of Bill's patches are turning up in other subsystems (as happened
> with i2c).

I'd really like to just be rid of these __dev* markings now, instead of
dragging it out over two kernel releases.  The patches are now all fixed
up properly, and I'll be sending a new merge request to Linus right
after this after the git tree is mirrored properly.

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/