3.2-rc1 rebase review

Tim Gardner tim.gardner at canonical.com
Wed Nov 9 00:21:55 UTC 2011


On 11/08/2011 02:30 PM, Leann Ogasawara wrote:
> On Tue, 2011-11-08 at 14:08 -0700, Tim Gardner wrote:
>> I rebased some of the commit/revert commit pairs out of existence,
>> though there are still more to do.
>>
>> Andy - please run the config checker to look for inconsistencies.
>>
>> Kees and Andy - Please check that I resolved these patch conflicts
>> correctly:
>>
>> UBUNTU: ubuntu: Yama - unconditionally chain to Yama LSM
>> UBUNTU: SAUCE: add option to hand off all kernel parameters to init
>>
>> These patches were dropped because of excessive conflict:
>>
>> UBUNTU: ARM: Adding regulator supply for vdds_sdi.
>> UBUNTU: SAUCE: ARM: OMAP: Add macros for comparing silicon revision
>> Revert "UBUNTU: SAUCE: ARM: OMAP: Add macros for comparing silicon revision"
>> UBUNTU: SAUCE: (no-up) Input: elantech - Add v3 hardware support
>> UBUNTU: SAUCE: HID: add support for MacBookAir4,2 keyboard.
>> UBUNTU: SAUCE: HID: add MacBookAir4, 2 to hid_have_special_driver[]
>> UBUNTU: SAUCE: (drop during 3.2 merge) xHCI: AMD isoc link TRB chain bit
>> quirk
>
> If you want, you can also drop the following patches.  Otherwise, I'll
> just do it after you push.
>
> (drop ubuntu/rtl8192se)
> UBUNTU: ubuntu: Remove ubuntu/rtl8192se
> UBUNTU: ubuntu: enable rfkill for rtl8192se driver
> UBUNTU: ubuntu: rtl8192se: fix source file newline
> UBUNTU: ubuntu: rtl8192se: fix source file perms
> UBUNTU: ubuntu: rtl8192se: Force a build for a 2.6/3.0 kernel
> UBUNTU: ubuntu: rtl8192se -- update to version 0017.0507.2010
> UBUNTU: ubuntu: rtl8192se -- update to version 0015.0127.2010
> UBUNTU: ubuntu: rtl8192se -- version 2010-0115,0014
>
> (drop ubuntu/iscsitarget)
> UBUNTU: ubuntu: iscsitarget: Remove driver from the kernel
> UBUNTU: ubuntu: iscsitarget -- follow changes to open_bdev_exclusive
> UBUNTU: ubuntu: iscsitarget -- convert NIPQUAD to %pI4
> UBUNTU: ubuntu: iscsitarget -- follow changes to semaphore initialisation
> UBUNTU: ubuntu: iscsitarget -- re-instate copy_io_context
> UBUNTU: ubuntu: iscsitarget -- version 1.4.20.2
> UBUNTU: ubuntu: iscsitarget -- version 1.4.20.1
> UBUNTU: ubuntu: iscsitarget -- rename daddr inet_sock field
> UBUNTU: ubuntu: iscsitarget --- version 1.4.19
>
> Thanks,
> Leann
>

Have at it. I pushed master-next before sending the review announcement.

rtg
-- 
Tim Gardner tim.gardner at canonical.com



More information about the kernel-team mailing list