mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Helge Deller <deller@gmx.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Parisc List <linux-parisc@vger.kernel.org>,
	Arnd Bergmann <arnd@arndb.de>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the parisc-hd tree with the asm-generic tree
Date: Tue, 15 Dec 2020 05:45:49 +0100	[thread overview]
Message-ID: <0f001a81-b1d3-4df4-28db-b193812a1a42@gmx.de> (raw)
In-Reply-To: <20201215064847.3676d9bf@canb.auug.org.au>


[-- Attachment #1.1: Type: text/plain, Size: 1121 bytes --]

On 12/14/20 8:48 PM, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 2 Nov 2020 12:38:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the parisc-hd tree got a conflict in:
>>
>>   arch/parisc/kernel/time.c
>>
>> between commit:
>>
>>   686092e7daaa ("parisc: use legacy_timer_tick")
>>
>> from the asm-generic tree and commit:
>>
>>   3b7ab4a74a2d ("parisc: Switch to clockevent based timers")
>>
>> from the parisc-hd tree.
>>
>> I fixed it up (I effectively reverted the former commit) 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.
> 
> This is just a reminder that this conflict still exists.

I dropped the patch from the parisc-hd tree for now - 
it needs more work and will not be part of the next merge window.

Thanks,
Helge


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

  reply	other threads:[~2020-12-15  4:48 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-02  1:38 Stephen Rothwell
2020-12-14 19:48 ` Stephen Rothwell
2020-12-15  4:45   ` Helge Deller [this message]
2020-12-15  5:05     ` Stephen Rothwell
2022-02-28  0:45 Stephen Rothwell
2022-03-22  0:09 ` Stephen Rothwell
2022-03-22  7:34   ` Helge Deller
2022-03-22 17:06     ` Arnd Bergmann
2022-03-22 20:01       ` Helge Deller

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=0f001a81-b1d3-4df4-28db-b193812a1a42@gmx.de \
    --to=deller@gmx.de \
    --cc=arnd@arndb.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-parisc@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

all inboxes | Powered by JetHome®