Messages in this thread | | | Date | Tue, 2 Jul 2013 17:00:43 -0700 | Subject | Re: [GIT PULL 3/7] ARM SoC specific changes | From | Olof Johansson <> |
| |
On Tue, Jul 2, 2013 at 4:51 PM, Linus Torvalds <torvalds@linux-foundation.org> wrote: > On Tue, Jul 2, 2013 at 4:17 PM, Russell King - ARM Linux > <linux@arm.linux.org.uk> wrote: >> Please don't merge this yet. > > Oops, too late. The ARM SoC pull requests got merged a couple of hours ago..
It should hopefully not be a big problem, you'll see a merge conflict (so will sfr) when merging from Russell due to add/add conflicts been resolved by ordering them in opposite order in arch/arm/include/asm/glue-proc.h.
Feel free to flip them back to Russell's preferred ordering at that time, of course.
-Olof
| |