linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* Please remind 'WARNING: about Samsung merge window over'
@ 2010-08-02  5:52 Kukjin Kim
  2010-08-02  6:24 ` Kyungmin Park
  0 siblings, 1 reply; 8+ messages in thread
From: Kukjin Kim @ 2010-08-02  5:52 UTC (permalink / raw)
  To: linux-arm-kernel

Please remind following which is from discussion about Samsung merge stuff
with Russell.

---

> > So, please send the majority of patches *before* the merge window and
> > try to avoid sending anything but fixes during the merge window itself.
> > The merge window is for code which has _already_ been merged and has
> > been in linux-next to be merged into Linus' tree.  It's not for new
> > code to be reviewed.
> 
> Next merge window, which will probably be the last I will handle for the
> S5P range, will have an earlier cut-off point. It was a big rush to get
> this lot reviewed and merged.

It also means that *NONE* of the stuff in your second pull request was
in linux-next for *any* time.  It also conflicted with my tree.  The
result of that is I'm expecting mainline to be dead for all ARM with:

arch/arm/Kconfig:883: can't open file "arch/arm/plat-s5pc1xx/Kconfig"

because of a mis-merge - and since that conflict was not picked up by
linux-next, it could not have been previously published.

For the next merge window, I will avoid reading email for the duration
of the window - which means those who are late for the merge window will
simply not have their patches and trees pulled.  This means we _will_
have time to resolve conflicts and find problems _before_ the merge
window

---

I have no more plan to merge s5p stuff for this merge window, but reviewed
here until now.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2010-08-03  0:56 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-02  5:52 Please remind 'WARNING: about Samsung merge window over' Kukjin Kim
2010-08-02  6:24 ` Kyungmin Park
2010-08-02  7:07   ` Grant Likely
2010-08-02  7:31   ` Russell King - ARM Linux
2010-08-02  8:35     ` Kyungmin Park
2010-08-02  9:22       ` Russell King - ARM Linux
2010-08-03  0:53         ` Kukjin Kim
2010-08-03  0:56           ` Kyungmin Park

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).