-
由 Greg Kroah-Hartman 提交于
This file provides a basic guide for how to handle conflict resolution when it comes up in the development process. Acked-by: NAlex Deucher <alexander.deucher@amd.com> Acked-by: NArjan van de Ven <arjanvandeven@gmail.com> Acked-by: NArnaldo Carvalho de Melo <acme@redhat.com> Acked-by: NArnd Bergmann <arnd@arndb.de> Acked-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: NChris Ball <chris@printf.net> Acked-by: NChris Mason <clm@fb.com> Acked-by: NChris Metcalf <cmetcalf@ezchip.com> Acked-by: NDan Carpenter <dan.carpenter@oracle.com> Acked-by: NDaniel Vetter <daniel.vetter@ffwll.ch> Acked-by: NDave Airlie <airlied@redhat.com> Acked-by: NDavid Herrmann <dh.herrmann@gmail.com> Acked-by: NFabio Estevam <festevam@gmail.com> Acked-by: NFelipe Balbi <balbi@ti.com> Acked-by: NGeert Uytterhoeven <geert@linux-m68k.org> Acked-by: NGerd Hoffmann <kraxel@redhat.com> Acked-by: NGrant Likely <grant.likely@linaro.org> Acked-by: NGuenter Roeck <linux@roeck-us.net> Acked-by: NH Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: NHannes Reinecke <hare@suse.de> Acked-by: NHans Verkuil <hans.verkuil@cisco.com> Acked-by: NHans de Goede <hdegoede@redhat.com> Acked-by: NHugh Dickins <hughd@google.com> Acked-by: NIngo Molnar <mingo@kernel.org> Acked-by: NJaegeuk Kim <jaegeuk@kernel.org> Acked-by: NJames Bottomley <James.Bottomley@HansenPartnership.com> Acked-by: NJens Axboe <axboe@kernel.dk> Acked-by: NJes Sorensen <Jes.Sorensen@gmail.com> Acked-by: NJohan Hedberg <johan.hedberg@intel.com> Acked-by: NJohan Hovold <johan@kernel.org> Acked-by: NJohannes Berg <johannes@sipsolutions.net> Acked-by: NJohn W. Linville <linville@tuxdriver.com> Acked-by: NJonathan Corbet <corbet@lwn.net> Acked-by: NJosh Triplett <josh@joshtriplett.org> Acked-by: NJulia Lawall <julia.lawall@lip6.fr> Acked-by: NKees Cook <keescook@chromium.org> Acked-by: NKevin Hilman <khilman@linaro.org> Acked-by: NKonrad Rzeszutek Wilk <konrad.wilk@oracle.com> Acked-by: NKristen Carlson Accardi <kristen@linux.intel.com> Acked-by: NKyungmin Park <kyungmin.park@samsung.com> Acked-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: NLinus Walleij <linus.walleij@linaro.org> Acked-by: NLuis R. Rodriguez <mcgrof@do-not-panic.com> Acked-by: NMagnus Damm <damm@opensource.se> Acked-by: NMark Brown <broonie@kernel.org> Acked-by: NMauro Carvalho Chehab <mchehab@osg.samsung.com> Acked-by: NMaxime Ripard <maxime.ripard@free-electrons.com> Acked-by: NMimi Zohar <zohar@linux.vnet.ibm.com> Acked-by: NNeilBrown <neilb@suse.de> Acked-by: NOlof Johansson <olof@lixom.net> Acked-by: NPaul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: NRafael J. Wysocki <rafael@kernel.org> Acked-by: NRik van Riel <riel@redhat.com> Acked-by: NSachin Prabhu <sprabhu@redhat.com> Acked-by: NShuah Khan <shuahkh@osg.samsung.com> Acked-by: NSimon Horman <horms@verge.net.au> Acked-by: NStephen Rothwell <sfr@canb.auug.org.au> Acked-by: NStephen Warren <swarren@wwwdotorg.org> Acked-by: NSteven Rostedt <rostedt@goodmis.org> Acked-by: NTakashi Iwai <tiwai@suse.de> Acked-by: NTejun Heo <tj@kernel.org> Acked-by: NTheodore Ts'o <tytso@mit.edu> Acked-by: NTony Luck <tony.luck@intel.com> Acked-by: NWill Deacon <will.deacon@arm.com> Acked-by: NWilly Tarreau <w@1wt.eu> Acked-by: NZefan Li <lizefan@huawei.com> Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
ddbd2b7a