Hi Bruce, The merge are working fine. Thanks a lot. I will submit the changes on meta branch to merge valleyisland-io-3.0 feature branch later by today (Malaysia time). Thanks again :)
Rebecca > -----Original Message----- > From: Bruce Ashfield [mailto:bruce.ashfi...@windriver.com] > Sent: 03 September, 2014 3:18 AM > To: Chang, Rebecca Swee Fun; linux-yocto@yoctoproject.org > Subject: Re: [linux-yocto] [PATCHv2 0/6] [3.10] Feature branch for Baytrail IO > > On 2014-08-29, 5:29 AM, rebecca.swee.fun.ch...@intel.com wrote: > > From: Chang Rebecca Swee Fun <rebecca.swee.fun.ch...@intel.com> > > > > Hi all, > > > > Patchv2: > > This is the 2nd revision of the feature branch I have submitted yesterday. > > I have used the outdated board file for Baytrail in previous submission. > > I have updated the tree with a latest board file to enable DMA clock > > for Baytrail. > > > > Change log summary: > > x86/byt: enable board file for Baytrail LPSS PCI mode Update with new > > board file to enable LPIO DMA 1. > > > > Thanks and regards. > > Rebecca > > > > Patchv1: > > This is the rebased feature branch for valley island BSP. The purpose > > of this feature branch is to stage the Baytrail I/O specific patches > > that is not encouraged to be upstream, for example, board file. This > > tree also consists of Baytrail pinctrl code base which it is not upstream. > > > > I intend to create a new branch, named: valleyisland-io-3.0. The old > > version feature branch (valleyisland-io-1.0 and valleyisland-io-2.0) > > shall be removed once everything has lined up accordingly. > > > > Sorry that the valleyisland-io-2.0 was created and not used until now. > > For future backport commits, we will target to merge in standard/base > > instead of putting them in feature branch. > > > > Please review and if no further comments, please help to put this > > patches into new branch: valleyisland-io-3.0. Sorry for any incovenient > > caused. > > These look ok to me, and no worries about the 2.0 feature branch. I've pushed > this change to the repositories now, in a 3.0 branch. > > Make sure you are up to date with yocto/oe-core master, since the tools have > been updated and can now handle the valleyisland-io-3.0 branch being the > same as standard/base (i.e. no reset of the content). > > Cheers, > > Bruce > > > > > Thanks in advance. > > > > Rebecca > > > > The following changes since commit > aa677a2d02677ec92d59a8c36d001cf2f5cf3260: > > > > usb/core: fix merge issue (2014-06-16 12:24:47 -0400) > > > > are available in the git repository at: > > > > git://git.yoctoproject.org/linux-yocto-contrib rebeccas/rebase-feature- > branch > > > > http://git.yoctoproject.org/cgit.cgi/linux-yocto-contrib/log/?h=rebecc > > as/rebase-feature-branch > > > > Chang Rebecca Swee Fun (1): > > x86/byt: enable board file for Baytrail LPSS PCI mode > > > > Chew, Chiau Ee (1): > > x86/Kconfig: add PCI dependency for CONFIG_X86_INTEL_LPSS > > > > Chew, Kean Ho (4): > > pinctrl-baytrail: add function mux checking in gpio pin request > > pinctrl-baytrail: unmap interrupt when free the gpio pin > > pinctrl-baytrail: enable platform device in the absent of ACPI > > enumeration > > pinctrl-baytrail: setup IOAPIC interrupt for GPIO clusters on non-ACPI > > system > > > > arch/x86/Kconfig | 11 ++- > > arch/x86/platform/Makefile | 3 + > > arch/x86/platform/byt/Makefile | 1 + > > arch/x86/platform/byt/byt-board.c | 92 +++++++++++++++++++ > > drivers/pinctrl/Kconfig | 19 +++- > > drivers/pinctrl/Makefile | 1 + > > drivers/pinctrl/pinctrl-baytrail-dev.c | 159 > +++++++++++++++++++++++++++++++++ > > drivers/pinctrl/pinctrl-baytrail.c | 101 +++++++++++++++++++-- > > include/linux/pinctrl/pinctrl-byt.h | 16 ++++ > > 9 files changed, 393 insertions(+), 10 deletions(-) > > create mode 100644 arch/x86/platform/byt/Makefile > > create mode 100644 arch/x86/platform/byt/byt-board.c > > create mode 100644 drivers/pinctrl/pinctrl-baytrail-dev.c > > create mode 100644 include/linux/pinctrl/pinctrl-byt.h > > -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
