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] [thread-next>] [day] [month] [year] [list]
Date:	Thu, 20 Dec 2012 09:35:49 -0800
From:	Tony Lindgren <tony@...mide.com>
To:	Olof Johansson <olof@...om.net>
Cc:	Linus Torvalds <torvalds@...ux-foundation.org>, arm@...nel.org,
	linux-arm-kernel@...ts.infradead.org,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Russell King - ARM Linux <linux@....linux.org.uk>,
	maxime.ripard@...e-electrons.com
Subject: Re: [GIT PULL v2] ARM: arm-soc fixes for 3.8

* Olof Johansson <olof@...om.net> [121220 09:30]:
> [proper reply-to-all this time]
> 
> On Thu, Dec 20, 2012 at 8:49 AM, Linus Torvalds
> <torvalds@...ux-foundation.org> wrote:
> > On Thu, Dec 20, 2012 at 8:38 AM, Olof Johansson <olof@...om.net> wrote:
> >>
> >> One of the sunxi patches from the last pull request was misapplied (I
> >> realized what happened -- git am -s didn't apply cleanly so I had done it
> >> through regular patch, thus not catching the renames properly). Here's
> >> a fresh version of the pull request with a couple more OMAP and Samsung
> >> patches included.
> >
> > Argh!
> >
> > I pulled your earlier branch due to Tony's ack, and now you're
> > re-created that branch with new pulls (effectively rebasing it).
> >
> > Don't do things like this to me.
> 
> Yeah, sorry about that -- I wanted to replace the broken patch, and
> Tony's branch was based on a newer version of your tree so I brought
> everything forward as I had to rebase anyway.
> 
> I'll rebuild on top of what you've pulled, and send a fresh request of
> just the delta. Sorry about the race condition here.

Sorry for me adding to the confusion too.

Looks like Linus already applied "ARM: OMAP: Fix build breakage due
to missing include in i2c.c" that I had queued earlier.

Olof, I suggest you just merge my pull request up to the other commit
c16acf12 (ARM: OMAP2+: Fix compillation error in mach-omap2/timer.c).
Or just pick it whichever works better for you.

Regards,

Tony
--
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/

Powered by blists - more mailing lists