mirror of
https://github.com/torvalds/linux.git
synced 2024-11-19 02:21:47 +00:00
c6a677c6f3
Here is the big staging tree update for 4.12-rc1. And it's a big one, adding about 350k new lines of crap^Wcode, mostly all in a big dump of media drivers from Intel. But there's other new drivers in here as well, yet-another-wifi driver, new IIO drivers, and a new crypto accelerator. We also deleted a bunch of stuff, mostly in patch cleanups, but also the Android ION code has shrunk a lot, and the Android low memory killer driver was finally deleted, much to the celebration of the -mm developers. All of these have been in linux-next with a few build issues that will show up when you merge to your tree, I'll follow up with fixes for those after this gets merged. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCWQzzlQ8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+ylNMgCcD+GoaF/Ml7YnULRl2GG/526II78AnitZ8qjd rPqeowMIewYu9fgckLUc =7rzO -----END PGP SIGNATURE----- Merge tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging/IIO updates from Greg KH: "Here is the big staging tree update for 4.12-rc1. It's a big one, adding about 350k new lines of crap^Wcode, mostly all in a big dump of media drivers from Intel. But there's other new drivers in here as well, yet-another-wifi driver, new IIO drivers, and a new crypto accelerator. We also deleted a bunch of stuff, mostly in patch cleanups, but also the Android ION code has shrunk a lot, and the Android low memory killer driver was finally deleted, much to the celebration of the -mm developers. All of these have been in linux-next with a few build issues that will show up when you merge to your tree" Merge conflicts in the new rtl8723bs driver (due to the wifi changes this merge window) handled as per linux-next, courtesy of Stephen Rothwell. * tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1182 commits) staging: fsl-mc/dpio: add cpu <--> LE conversion for dpaa2_fd staging: ks7010: remove line continuations in quoted strings staging: vt6656: use tabs instead of spaces staging: android: ion: Fix unnecessary initialization of static variable staging: media: atomisp: fix range checking on clk_num staging: media: atomisp: fix misspelled word in comment staging: media: atomisp: kmap() can't fail staging: atomisp: remove #ifdef for runtime PM functions staging: atomisp: satm include directory is gone atomisp: remove some more unused files atomisp: remove hmm_load/store/clear indirections atomisp: kill off mmgr_free atomisp: clean up the hmm init/cleanup indirections atomisp: handle allocation calls before init in the hmm layer staging: fsl-dpaa2/eth: Add maintainer for Ethernet driver staging: fsl-dpaa2/eth: Add TODO file staging: fsl-dpaa2/eth: Add trace points staging: fsl-dpaa2/eth: Add driver specific stats staging: fsl-dpaa2/eth: Add ethtool support staging: fsl-dpaa2/eth: Add Freescale DPAA2 Ethernet driver ...
181 lines
8.0 KiB
Plaintext
181 lines
8.0 KiB
Plaintext
#
|
|
# This list is used by git-shortlog to fix a few botched name translations
|
|
# in the git archive, either because the author's full name was messed up
|
|
# and/or not always written the same way, making contributions from the
|
|
# same person appearing not to be so or badly displayed.
|
|
#
|
|
# repo-abbrev: /pub/scm/linux/kernel/git/
|
|
#
|
|
|
|
Aaron Durbin <adurbin@google.com>
|
|
Adam Oldham <oldhamca@gmail.com>
|
|
Adam Radford <aradford@gmail.com>
|
|
Adrian Bunk <bunk@stusta.de>
|
|
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
|
|
Alan Cox <alan@lxorguk.ukuu.org.uk>
|
|
Alan Cox <root@hraefn.swansea.linux.org.uk>
|
|
Aleksey Gorelov <aleksey_gorelov@phoenix.com>
|
|
Al Viro <viro@ftp.linux.org.uk>
|
|
Al Viro <viro@zenIV.linux.org.uk>
|
|
Andreas Herrmann <aherrman@de.ibm.com>
|
|
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
|
|
Andrew Morton <akpm@linux-foundation.org>
|
|
Andrew Vasquez <andrew.vasquez@qlogic.com>
|
|
Andy Adamson <andros@citi.umich.edu>
|
|
Antoine Tenart <antoine.tenart@free-electrons.com>
|
|
Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
|
|
Archit Taneja <archit@ti.com>
|
|
Arnaud Patard <arnaud.patard@rtp-net.org>
|
|
Arnd Bergmann <arnd@arndb.de>
|
|
Axel Dyks <xl@xlsigned.net>
|
|
Axel Lin <axel.lin@gmail.com>
|
|
Ben Gardner <bgardner@wabtec.com>
|
|
Ben M Cahill <ben.m.cahill@intel.com>
|
|
Björn Steinbrink <B.Steinbrink@gmx.de>
|
|
Boris Brezillon <boris.brezillon@free-electrons.com>
|
|
Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>
|
|
Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>
|
|
Brian Avery <b.avery@hp.com>
|
|
Brian King <brking@us.ibm.com>
|
|
Christoph Hellwig <hch@lst.de>
|
|
Christophe Ricard <christophe.ricard@gmail.com>
|
|
Corey Minyard <minyard@acm.org>
|
|
Damian Hobson-Garcia <dhobsong@igel.co.jp>
|
|
David Brownell <david-b@pacbell.net>
|
|
David Woodhouse <dwmw2@shinybook.infradead.org>
|
|
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
|
|
Domen Puncer <domen@coderock.org>
|
|
Douglas Gilbert <dougg@torque.net>
|
|
Ed L. Cashin <ecashin@coraid.com>
|
|
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
|
|
Felipe W Damasio <felipewd@terra.com.br>
|
|
Felix Kuhling <fxkuehl@gmx.de>
|
|
Felix Moeller <felix@derklecks.de>
|
|
Filipe Lautert <filipe@icewall.org>
|
|
Franck Bui-Huu <vagabon.xyz@gmail.com>
|
|
Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
|
|
Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
|
|
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
|
|
Frank Zago <fzago@systemfabricworks.com>
|
|
Greg Kroah-Hartman <greg@echidna.(none)>
|
|
Greg Kroah-Hartman <gregkh@suse.de>
|
|
Greg Kroah-Hartman <greg@kroah.com>
|
|
Henk Vergonet <Henk.Vergonet@gmail.com>
|
|
Henrik Kretzschmar <henne@nachtwindheim.de>
|
|
Henrik Rydberg <rydberg@bitmath.org>
|
|
Herbert Xu <herbert@gondor.apana.org.au>
|
|
Jacob Shin <Jacob.Shin@amd.com>
|
|
James Bottomley <jejb@mulgrave.(none)>
|
|
James Bottomley <jejb@titanic.il.steeleye.com>
|
|
James E Wilson <wilson@specifix.com>
|
|
James Ketrenos <jketreno@io.(none)>
|
|
Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
|
|
<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
|
|
Jean Tourrilhes <jt@hpl.hp.com>
|
|
Jeff Garzik <jgarzik@pretzel.yyz.us>
|
|
Jens Axboe <axboe@suse.de>
|
|
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
|
|
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
|
|
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
|
|
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
|
|
John Stultz <johnstul@us.ibm.com>
|
|
<josh@joshtriplett.org> <josh@freedesktop.org>
|
|
<josh@joshtriplett.org> <josh@kernel.org>
|
|
<josh@joshtriplett.org> <josht@linux.vnet.ibm.com>
|
|
<josh@joshtriplett.org> <josht@us.ibm.com>
|
|
<josh@joshtriplett.org> <josht@vnet.ibm.com>
|
|
Juha Yrjola <at solidboot.com>
|
|
Juha Yrjola <juha.yrjola@nokia.com>
|
|
Juha Yrjola <juha.yrjola@solidboot.com>
|
|
Kay Sievers <kay.sievers@vrfy.org>
|
|
Kenneth W Chen <kenneth.w.chen@intel.com>
|
|
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
|
|
Koushik <raghavendra.koushik@neterion.com>
|
|
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
|
|
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
|
|
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
|
|
Leonid I Ananiev <leonid.i.ananiev@intel.com>
|
|
Linas Vepstas <linas@austin.ibm.com>
|
|
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
|
|
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
|
|
Mark Brown <broonie@sirena.org.uk>
|
|
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
|
|
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
|
|
Matthieu CASTET <castet.matthieu@free.fr>
|
|
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
|
|
Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
|
|
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org>
|
|
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
|
|
Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
|
|
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
|
|
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
|
|
Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
|
|
Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
|
|
Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
|
|
Mayuresh Janorkar <mayur@ti.com>
|
|
Michael Buesch <m@bues.ch>
|
|
Michel Dänzer <michel@tungstengraphics.com>
|
|
Mitesh shah <mshah@teja.com>
|
|
Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
|
|
Morten Welinder <terra@gnome.org>
|
|
Morten Welinder <welinder@anemone.rentec.com>
|
|
Morten Welinder <welinder@darter.rentec.com>
|
|
Morten Welinder <welinder@troll.com>
|
|
Mythri P K <mythripk@ti.com>
|
|
Nguyen Anh Quynh <aquynh@gmail.com>
|
|
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
|
|
Patrick Mochel <mochel@digitalimplant.org>
|
|
Peter A Jonsson <pj@ludd.ltu.se>
|
|
Peter Oruba <peter@oruba.de>
|
|
Peter Oruba <peter.oruba@amd.com>
|
|
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
|
|
Praveen BP <praveenbp@ti.com>
|
|
Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
|
|
Rajesh Shah <rajesh.shah@intel.com>
|
|
Ralf Baechle <ralf@linux-mips.org>
|
|
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
|
|
Rémi Denis-Courmont <rdenis@simphalempin.com>
|
|
Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
|
|
Rudolf Marek <R.Marek@sh.cvut.cz>
|
|
Rui Saraiva <rmps@joel.ist.utl.pt>
|
|
Sachin P Sant <ssant@in.ibm.com>
|
|
Sarangdhar Joshi <spjoshi@codeaurora.org>
|
|
Sam Ravnborg <sam@mars.ravnborg.org>
|
|
Santosh Shilimkar <ssantosh@kernel.org>
|
|
Santosh Shilimkar <santosh.shilimkar@oracle.org>
|
|
Sascha Hauer <s.hauer@pengutronix.de>
|
|
S.Çağlar Onur <caglar@pardus.org.tr>
|
|
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
|
|
Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
|
|
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
|
|
Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
|
|
Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
|
|
Simon Kelley <simon@thekelleys.org.uk>
|
|
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
|
|
Stephen Hemminger <shemminger@osdl.org>
|
|
Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
|
|
Subhash Jadavani <subhashj@codeaurora.org>
|
|
Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
|
|
Sumit Semwal <sumit.semwal@ti.com>
|
|
Tejun Heo <htejun@gmail.com>
|
|
Thomas Graf <tgraf@suug.ch>
|
|
Thomas Pedersen <twp@codeaurora.org>
|
|
Tony Luck <tony.luck@intel.com>
|
|
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
|
|
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
|
|
Uwe Kleine-König <ukl@pengutronix.de>
|
|
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
|
|
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
|
|
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
|
|
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
|
|
Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
|
|
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
|
|
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
|
|
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
|
|
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
|
|
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
|
|
Yusuke Goda <goda.yusuke@renesas.com>
|
|
Gustavo Padovan <gustavo@las.ic.unicamp.br>
|
|
Gustavo Padovan <padovan@profusion.mobi>
|