linux-kernel - Re: linux-next: manual merge of the watchdog tree with the arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-id: <alpine.LFD.2.00.0906090913520.31536@xanadu.home>
Date:	Tue, 09 Jun 2009 09:18:00 -0400 (EDT)
From:	Nicolas Pitre <nico@....org>
To:	Wim Van Sebroeck <wim@...ana.be>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, lkml <linux-kernel@...r.kernel.org>,
	Linus Walleij <linus.walleij@...ricsson.com>,
	Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the watchdog tree with the arm tree

On Tue, 9 Jun 2009, Wim Van Sebroeck wrote:

> Hi Stephen,
> 
> > Today's linux-next merge of the watchdog tree got a conflict in
> > drivers/watchdog/Makefile between commit
> > 3b937a7dbddbedd9457b33fcc8fa369c0c229c6e ("[ARM] Orion/Kirkwood: rename
> > orion5x_wdt to orion_wdt") from the arm tree and commit
> > e35f878d8313518a20d3c53393d14761dca74624 ("[WATCHDOG] U300 COH 901 327
> > watchdog driver") from the watchdog tree.
> 
> It would have been nice if the orion watchdog rename patch would have been
> sent to the watchdog maintainer also...

The patch has implications touching 2 different ARM subarchitectures 
outside the driver itself, so I felt it more appropriate for the rename 
to happen all at once and be carried through the ARM tree.  The driver 
sees no functional changes.
But I agree that I could have sent you a note.

> > Just context changes.  I fixed it up (see below) and can carry the fix as
> > necessary.
> 
> I'll have a look at the commit and might pull it into the watchdog tree also.
> That way you shouldn't have any problem with it.

I don't think it'll apply cleanly to the watchdog tree without greater 
conflicts with the other ARM related changes.


Nicolas
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/