linux-firmware: Revert prism54 firmware addition due to licensing
Chase Douglas
chase.douglas at canonical.com
Tue Feb 23 16:21:07 UTC 2010
Tim Gardner wrote:
> Chase Douglas wrote:
>> The following changes since commit 6c0067f4e4aa74197bdbca8a784c0a6514780142:
>> Chase Douglas (1):
>> Firmware for radeon R600 and R700 graphics hardware
>>
>> are available in the git repository at:
>>
>> git://kernel.ubuntu.com/cndougla/linux-firmware.git lucid
>>
>> Chase Douglas (1):
>> Revert "firmware for prism54 kernel >=2.6.29"
>>
>> The firmware is missing a license statement, so these files have been moved to
>> linux-firmware-nonfree.
>>
>> prism54/isl3877 | Bin 112128 -> 0 bytes
>> prism54/isl3890 | Bin 93996 -> 0 bytes
>> prism54_softmac/BOM | 4 ----
>> prism54_softmac/isl3886pci | Bin 29036 -> 0 bytes
>> prism54_softmac/isl3886usb | Bin 29500 -> 0 bytes
>> prism54_softmac/isl3887usb | Bin 29736 -> 0 bytes
>> 6 files changed, 0 insertions(+), 4 deletions(-)
>> delete mode 100644 prism54/isl3877
>> delete mode 100644 prism54/isl3890
>> delete mode 100644 prism54_softmac/BOM
>> delete mode 100644 prism54_softmac/isl3886pci
>> delete mode 100644 prism54_softmac/isl3886usb
>> delete mode 100644 prism54_softmac/isl3887usb
>>
>
> You need to either rebase your lucid branch against origin, or (which is
> likely easier) just fetch origin/lucid and reset --hard FETCH_HEAD. Then
> implement the revert and send a new pull request.
I know what happened. I'll rebase and send a new pull request.
Thanks,
Chase
More information about the kernel-team
mailing list