[linux-yocto] [PATCH 00/24] [linux-yocto-3.10] [Scenerio 1] Enable feature branch for Valley Island features
Bruce Ashfield
bruce.ashfield at windriver.com
Thu May 22 21:24:48 PDT 2014
On 2014-05-23, 12:12 AM, Chang, Rebecca Swee Fun wrote:
>
>
>> -----Original Message-----
>> From: Bruce Ashfield [mailto:bruce.ashfield at windriver.com]
>> Sent: 23 May, 2014 11:09 AM
>> To: Chang, Rebecca Swee Fun; linux-yocto at yoctoproject.org
>> Subject: Re: [linux-yocto] [PATCH 00/24] [linux-yocto-3.10] [Scenerio 1]
>> Enable feature branch for Valley Island features
>>
>> On 2014-05-22, 11:04 PM, Bruce Ashfield wrote:
>>> On 2014-05-22, 10:56 PM, Chang, Rebecca Swee Fun wrote:
>>>> Hi Bruce,
>>>>
>>>> I have run a build test on the latest commits checked-in. The feature
>>>> branch was not merge in during build time. I think that the feature
>>>> branch should be branching out from commit
>>>> 3e0a296fae952d8d93eb0f96566bf6d4a978c8ee:minnowboard-keys: Bind
>>>> MinnowBoard buttons to arrow keys instead of the HEAD of
>> standard/base.
>>>>
>>>> As per my observation during my implementation of feature branch, the
>>>> feature branch should always branch out from an older version of
>>>> standard/base, not the HEAD.
>>>
>>> Unfortunately no .. we cannot do that. It needs to be from the top of
>>> standard/base and merge cleanly into standard/base from there.
>>
>> And to be clear. What I actually did before pushing that branch was rebase it
>> cleanly onto standard/base.
>>
>> So if your tree is up to date, you see the following:
>>
>> yow-bashfiel-d3 [/home/bruc....git-merge]> git checkout -b standard/base-
>> test standard/base Switched to a new branch 'standard/base-test'
>> yow-bashfiel-d3 [/home/bruc....git-merge]> git merge valleyisland-io-1.0
>> Updating 02f7e63e56c0..8ea4fb625f26 Fast-forward
>> Documentation/ABI/testing/sysfs-class-pwm | 79
>> +++++++++++++++++++++++++++
>> Documentation/i2c/busses/i2c-i801 | 2 +
>> Documentation/pwm.txt | 37 +++++++++++++
>> arch/x86/Kconfig | 11 +++-
>> arch/x86/platform/Makefile | 3 +
>> arch/x86/platform/byt/Makefile | 1 +
>> arch/x86/platform/byt/byt-board.c | 84
>> ++++++++++++++++++++++++++++
>> drivers/acpi/acpi_lpss.c | 11 ++++
>> drivers/dma/dw/pci.c | 33 +++++++++++
>> drivers/i2c/busses/Kconfig | 2 +
>> drivers/i2c/busses/i2c-designware-pcidrv.c | 66 +++++++++++++++++++---
>> drivers/i2c/busses/i2c-i801.c | 6 ++
>> drivers/mmc/host/sdhci.c | 4 +-
>> drivers/pinctrl/Kconfig | 19 ++++++-
>> drivers/pinctrl/Makefile | 1 +
>> drivers/pinctrl/pinctrl-baytrail-dev.c | 159
>> +++++++++++++++++++++++++++++++++++++++++++++++++++++
>> drivers/pinctrl/pinctrl-baytrail.c | 101
>> ++++++++++++++++++++++++++++++++--
>> drivers/pwm/Kconfig | 14 +++++
>> drivers/pwm/Makefile | 2 +
>> drivers/pwm/core.c | 25 ++++++++-
>> drivers/pwm/pwm-lpss.c | 183
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>> +++
>> drivers/pwm/sysfs.c | 352
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>> +
>> drivers/spi/Kconfig | 5 +-
>> drivers/spi/spi-pxa2xx-dma.c | 2 +-
>> drivers/spi/spi-pxa2xx-pci.c | 85
>> ++++++++++++++++++++++++-----
>> drivers/tty/serial/8250/8250_core.c | 2 +-
>> drivers/tty/serial/8250/8250_dw.c | 43 +++++++++++++++
>> drivers/tty/serial/8250/8250_pci.c | 145
>> ++++++++++++++++++++++++++++++++++++++++++++++++
>> drivers/usb/gadget/udc-core.c | 18 +++++-
>> include/linux/pinctrl/pinctrl-byt.h | 16 ++++++
>> include/linux/pwm.h | 29 +++++++++-
>> include/linux/usb/gadget.h | 4 ++
>> 32 files changed, 1501 insertions(+), 43 deletions(-)
>> create mode 100644 Documentation/ABI/testing/sysfs-class-pwm
>> 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 drivers/pwm/pwm-lpss.c
>> create mode 100644 drivers/pwm/sysfs.c
>> create mode 100644 include/linux/pinctrl/pinctrl-byt.h
>>
>> ----------
>>
>> So however you got a merge conflict. Your tree wasn't up to date.
>>
> I do not encounter any merge conflicts, is just that the branches is not merging. By checking my build, I notice that the valleyisland-io-1.0 branch has the same HEAD of standard/base (which means I don't see any I/O patches there in the feature branch that fetched by bitbake). This means that source tree I'm fetching during build time is not updated yet. Is there any occurrence that the new check-ins need some time to reflect to end users?
It could be a fetcher problem, since the branches are definitely not
the same.
yow-bashfiel-d3 [/home/bruc....git-merge]> git describe standard/base
v3.10.38-2595-g02f7e63e56c0
yow-bashfiel-d3 [/home/bruc....git-merge]> git describe valleyisland-io-1.0
v3.10.38-2618-g8ea4fb625f26
If you want to be sure that the fetcher is picking up changes from
a branch that isn't KBRANCH or meta, it just needs to be listed in
the SRCURI and the SRCREV set in the recipe for that branch. Which
is what we did with the old emgd feature branches.
If you do have all that set, and you aren't seeing the changes, then
the infrastructure is doing something strange.
Bruce
> My recipe is pointing to correct commit id. It is a weird case I never encounter before.
>
> Rebecca
>
>>>>
>>>> Can you please help to rebase the feature branch? The feature branch
>>>> should look exactly like the branch that I've pushed to the contrib.
>>>
>>> We can't. So in this case, I'm going back to scenario #2. And will
>>> have to do it tomorrow.
>>>
>>> Bruce
>>>
>>>>
>>>> Thank you.
>>>>
>>>> Rebecca
>>>>
>>>>> -----Original Message-----
>>>>> From: Bruce Ashfield [mailto:bruce.ashfield at windriver.com]
>>>>> Sent: 23 May, 2014 10:20 AM
>>>>> To: Chang, Rebecca Swee Fun; linux-yocto at yoctoproject.org
>>>>> Subject: Re: [linux-yocto] [PATCH 00/24] [linux-yocto-3.10]
>>>>> [Scenerio 1] Enable feature branch for Valley Island features
>>>>>
>>>>> On 2014-05-22, 6:09 AM, rebecca.swee.fun.chang at intel.com wrote:
>>>>>> From: Chang Rebecca Swee Fun <rebecca.swee.fun.chang at intel.com>
>>>>>>
>>>>>> Hi all,
>>>>>>
>>>>>> This is the scenerio 1 that Boon Leong mentioned in the Feature
>>>>>> Branch planning email thread. This will be the feature branch that
>>>>>> consists of all patches that are queuing into 3.10 LTS/LTSI and
>>>>>> also the so called "staging patches".
>>>>>>
>>>>>> Whenever the LTS/LTSI patches got merged into standard/base in
>>>>>> future, that will break this feature branch. I will be rebase this
>>>>>> feature branch to fix build breakage.
>>>>>>
>>>>>> This feature branch was implemented locally and built tested.
>>>>>> Feature branch was able to merge with standard/base and built
>>>>>> successfully. I have also run some sanity test to check the drivers
>>>>>> condition. All tests are done on Bayley Bay CRB and Bakersport CRB.
>>>>>> Valley Island Dev Kit
>>>>> was boot tested.
>>>>>> If this is the scenerio that you are looking for, please help to
>>>>>> create a new feature branch named: valleyisland-io-1.0 in
>>>>>> linux-yocto-3.10.
>>>>> I've gone with this option. I created a new branch called
>>>>> "valleyisland-io-1.0"
>>>>> from the latest standard/base and applied this patch series.
>>>>>
>>>>> The new content is now pushed to the repos.
>>>>>
>>>>> Let me know if you see anything wrong with the merge.
>>>>>
>>>>> Bruce
>>>>>
>>>>>> Thanks.
>>>>>> Rebecca
>>>>>>
>>>>>> The following changes since commit
>>>>> 3e0a296fae952d8d93eb0f96566bf6d4a978c8ee:
>>>>>> minnowboard-keys: Bind MinnowBoard buttons to arrow keys
>>>>>> (2014-02-12 00:08:25 -0500)
>>>>>>
>>>>>> are available in the git repository at:
>>>>>>
>>>>>> git://git.yoctoproject.org/linux-yocto-contrib
>>>>>> rebeccas/valleyisland-io-
>>>>> features-branch
>>>>>> http://git.yoctoproject.org/cgit.cgi/linux-yocto-contrib/log/?h=reb
>>>>>> ecc
>>>>>> as/valleyisland-io-features-branch
>>>>>>
>>>>>> Adrian Hunter (1):
>>>>>> mmc: sdhci: Allow for irq being shared
>>>>>>
>>>>>> Alan Stern (1):
>>>>>> usb: gadget: don't fail when DMA isn't present
>>>>>>
>>>>>> Chang Rebecca Swee Fun (1):
>>>>>> x86/byt: enable board file for Baytrail LPSS PCI mode
>>>>>>
>>>>>> Chew, Chiau Ee (8):
>>>>>> x86/Kconfig: add PCI dependency for CONFIG_X86_INTEL_LPSS
>>>>>> serial: 8250_dw: Added support for 1M, 2M, 3M and 4M exat baud
>> rate
>>>>>> spi/pxa2xx-pci: Add support for Intel BYT SPI
>>>>>> spi/pxa2xx: Fix BYT ACPI mode SPI DMA transfer failure at low
>>>>>> speeds
>>>>>> dma: dw: Add suspend and resume handling for PCI mode
>> DW_DMAC.
>>>>>> i2c: designware-pci: add 10-bit addressing mode functionality
>>>>>> for BYT
>>>>>> I2C
>>>>>> i2c: designware-pci: set ideal HCNT, LCNT and SDA hold time value
>>>>>> ACPI / LPSS: Add Intel BayTrail ACPI mode PWM
>>>>>>
>>>>>> 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
>>>>>>
>>>>>> Chew, Kean ho (1):
>>>>>> i2c: i801: enable Intel BayTrail SMBUS
>>>>>>
>>>>>> Felipe Balbi (1):
>>>>>> usb: gadget: udc-core: move sysfs_notify() to a workqueue
>>>>>>
>>>>>> H Hartley Sweeten (1):
>>>>>> pwm: Add sysfs interface
>>>>>>
>>>>>> Heikki Krogerus (2):
>>>>>> serial: 8250: don't change the fifo trigger level when using dma
>>>>>> serial: 8250_pci: add support for Intel BayTrail
>>>>>>
>>>>>> James Ralston (1):
>>>>>> i2c: i801: Add Device IDs for Intel Wildcat Point-LP PCH
>>>>>>
>>>>>> Mika Westerberg (2):
>>>>>> i2c: designware-pci: Add Baytrail PCI IDs
>>>>>> pwm: add support for Intel Low Power Subsystem PWM
>>>>>>
>>>>>> Seth Heasley (1):
>>>>>> i2c: i801: SMBus patch for Intel Coleto Creek DeviceIDs
>>>>>>
>>>>>> Documentation/ABI/testing/sysfs-class-pwm | 79 +++++++
>>>>>> Documentation/i2c/busses/i2c-i801 | 3 +
>>>>>> Documentation/pwm.txt | 37 +++
>>>>>> arch/x86/Kconfig | 11 +-
>>>>>> arch/x86/platform/Makefile | 3 +
>>>>>> arch/x86/platform/byt/Makefile | 1 +
>>>>>> arch/x86/platform/byt/byt-board.c | 84 +++++++
>>>>>> drivers/acpi/acpi_lpss.c | 11 +
>>>>>> drivers/dma/dw/pci.c | 33 +++
>>>>>> drivers/i2c/busses/Kconfig | 3 +
>>>>>> drivers/i2c/busses/i2c-designware-pcidrv.c | 66 +++++-
>>>>>> drivers/i2c/busses/i2c-i801.c | 9 +
>>>>>> drivers/mmc/host/sdhci.c | 4 +-
>>>>>> drivers/pinctrl/Kconfig | 19 +-
>>>>>> drivers/pinctrl/Makefile | 1 +
>>>>>> drivers/pinctrl/pinctrl-baytrail-dev.c | 159 +++++++++++++
>>>>>> drivers/pinctrl/pinctrl-baytrail.c | 101 ++++++++-
>>>>>> drivers/pwm/Kconfig | 14 ++
>>>>>> drivers/pwm/Makefile | 2 +
>>>>>> drivers/pwm/core.c | 25 +-
>>>>>> drivers/pwm/pwm-lpss.c | 183 +++++++++++++++
>>>>>> drivers/pwm/sysfs.c | 352
>>>>> +++++++++++++++++++++++++++++
>>>>>> drivers/spi/Kconfig | 5 +-
>>>>>> drivers/spi/spi-pxa2xx-dma.c | 2 +-
>>>>>> drivers/spi/spi-pxa2xx-pci.c | 85 +++++--
>>>>>> drivers/tty/serial/8250/8250_core.c | 2 +-
>>>>>> drivers/tty/serial/8250/8250_dw.c | 43 ++++
>>>>>> drivers/tty/serial/8250/8250_pci.c | 145 ++++++++++++
>>>>>> drivers/usb/gadget/udc-core.c | 18 +-
>>>>>> include/linux/pinctrl/pinctrl-byt.h | 16 ++
>>>>>> include/linux/pwm.h | 29 ++-
>>>>>> include/linux/usb/gadget.h | 4 +
>>>>>> 32 files changed, 1506 insertions(+), 43 deletions(-)
>>>>>> create mode 100644 Documentation/ABI/testing/sysfs-class-pwm
>>>>>> 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 drivers/pwm/pwm-lpss.c
>>>>>> create mode 100644 drivers/pwm/sysfs.c
>>>>>> create mode 100644 include/linux/pinctrl/pinctrl-byt.h
>>>>>>
>>>
>
More information about the linux-yocto
mailing list