linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for Nov 2
Date: Fri, 2 Nov 2018 14:57:48 +0100	[thread overview]
Message-ID: <CANiq72=kHErmujzMgM4akXeoWkSR0Q3VLd-6Mwiaj5mGan8yZw@mail.gmail.com> (raw)
In-Reply-To: <20181103002218.3bd015b3@canb.auug.org.au>

On Fri, Nov 2, 2018 at 2:22 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Its always OK (and actually useful) to move your branch head up to
> where Linus merged it (this is usually a fast forward anyway) since
> that doesn't add any new code to linux-next to conflict with code that
> is still pending to be merged by Linus.
>
> Also, adding bug fixes is always fine.
>
> I just want to avoid getting conflicts in linux-next between code
> that Linus will merge during this merge window and new code destined
> for the next merge window.

Thanks Stephen! I assumed as much, but I doubted due to the warning
(and I wanted to avoid giving you an unexpected surprise tomorrow).

Cheers,
Miguel

  reply	other threads:[~2018-11-02 13:57 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-02  3:30 linux-next: Tree for Nov 2 Stephen Rothwell
2018-11-02 10:44 ` Miguel Ojeda
2018-11-02 13:22   ` Stephen Rothwell
2018-11-02 13:57     ` Miguel Ojeda [this message]
2018-11-02 15:56       ` linux-next: Tree for Nov 2 (compiler-gcc.h) Randy Dunlap
2018-11-03 12:43         ` Miguel Ojeda
2018-11-03 16:10           ` Randy Dunlap
2018-11-03 22:58             ` Miguel Ojeda
2018-11-03 23:00               ` Randy Dunlap
2018-11-03 23:04                 ` Miguel Ojeda
  -- strict thread matches above, loose matches on Subject: below --
2023-11-02  2:13 linux-next: Tree for Nov 2 Stephen Rothwell
2022-11-02  4:31 Stephen Rothwell
2021-11-02  8:15 Stephen Rothwell
2020-11-02  5:28 Stephen Rothwell
2017-11-02  9:02 Stephen Rothwell
2015-11-02  4:40 Stephen Rothwell
2015-11-02  5:58 ` Sergey Senozhatsky
2015-11-02  6:30   ` Stephen Rothwell
2015-11-02 14:33     ` Steven Rostedt
2012-11-02  6:15 Stephen Rothwell
2011-11-02  5:54 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CANiq72=kHErmujzMgM4akXeoWkSR0Q3VLd-6Mwiaj5mGan8yZw@mail.gmail.com' \
    --to=miguel.ojeda.sandonis@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).