public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Simon Horman <horms@verge•net.au>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: please clean up the ipvs-next tree
Date: Mon, 6 Aug 2018 12:49:28 +1000	[thread overview]
Message-ID: <20180806124928.43db0f44@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

Hi Simon,

The ipvs-next tree appears to contain a set of patches that have been
merged into the net-next tree as different commits (some of them
slightly different). This is just causing conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2018-08-06  2:49 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-06  2:49 Stephen Rothwell [this message]
2018-08-07  8:57 ` linux-next: please clean up the ipvs-next tree Simon Horman

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=20180806124928.43db0f44@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=horms@verge$(echo .)net.au \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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