All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Networking <netdev@vger.kernel.org>,
	Benjamin Poirier <benjamin.poirier@gmail.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Przemek Kitszel <przemyslaw.kitszel@intel.com>
Subject: Re: linux-next: manual merge of the staging tree with the net-next tree
Date: Mon, 23 Oct 2023 09:27:47 +0200	[thread overview]
Message-ID: <2023102338-repaying-golf-a200@gregkh> (raw)
In-Reply-To: <20231023144720.231873f1@canb.auug.org.au>

On Mon, Oct 23, 2023 at 02:47:20PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/qlge/qlge_devlink.c
> 
> between commit:
> 
>   3465915e9985 ("staging: qlge: devlink health: use retained error fmsg API")
> 
> from the net-next tree and commit:
> 
>   875be090928d ("staging: qlge: Retire the driver")
> 
> from the staging tree.
> 
> I fixed it up (I just deleted the file) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

Wonderful, thanks for deleting the file.

greg k-h

  reply	other threads:[~2023-10-23  7:28 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-23  3:47 linux-next: manual merge of the staging tree with the net-next tree Stephen Rothwell
2023-10-23  7:27 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-08-02 23:33 Mark Brown
2021-08-03  8:57 ` Phillip Potter
2021-08-03  9:23   ` Arnd Bergmann
2021-08-09  7:55     ` Stephen Rothwell
2021-08-09 12:46       ` Phillip Potter
2021-08-09 20:00         ` Arnd Bergmann
2021-08-09 21:45           ` Phillip Potter
2019-02-28  4:52 Stephen Rothwell
2019-02-28  7:04 ` Greg KH
2018-03-15  7:35 Stephen Rothwell
2016-12-07  4:04 Stephen Rothwell
2016-12-07  7:02 ` Greg KH
2016-11-24  3:42 Stephen Rothwell
2016-10-21  1:21 Stephen Rothwell
2014-07-16  6:43 Stephen Rothwell
2014-07-16  6:43 ` Stephen Rothwell
2014-07-16 20:52 ` Greg KH
2014-05-28  8:28 Stephen Rothwell
2014-05-28  8:28 ` Stephen Rothwell
2014-05-28 15:49 ` Greg KH
2014-03-27  5:09 Stephen Rothwell
2014-03-27  5:09 ` Stephen Rothwell
2014-03-27 19:14 ` Eric W. Biederman
2014-03-27 19:14   ` Eric W. Biederman
2014-03-17  8:08 Stephen Rothwell
2014-03-17  8:08 ` Stephen Rothwell
2014-03-17 18:30 ` Greg KH
2013-05-29  4:14 Stephen Rothwell
2013-05-29  8:03 ` Greg KH
2013-01-23  4:45 Stephen Rothwell
2013-01-23  4:45 ` Stephen Rothwell
2013-01-23  4:52 ` Greg KH
2011-10-25  8:26 Stephen Rothwell
2011-10-25  8:26 ` 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=2023102338-repaying-golf-a200@gregkh \
    --to=greg@kroah.com \
    --cc=benjamin.poirier@gmail.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=przemyslaw.kitszel@intel.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.