[oe-commits] org.oe.dev linux-rp-2.6.23: Clean up and drop unused or now unneeded patches

[rpurdie commit]

linux-rp-2.6.23: Clean up and drop unused or now unneeded patches

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 796e4293e18e8d6047125f6871b0e7d07e05bcee
ViewMTN: http://monotone.openembedded.org/revision/info/796e4293e18e8d6047125f6871b0e7d07e05bcee
Files:
1
packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch
packages/linux/linux-rp-2.6.23/pda-power.patch
packages/linux/linux-rp-2.6.23/vt_ioctl_race.patch
packages/linux/linux-rp-2.6.23/w100fb-unused-var.patch
packages/linux/linux-rp_2.6.23.bb
Diffs:

#
# mt diff -r9dd50c135dc5b13818c0e9266fc2d8b3899ba60e -r796e4293e18e8d6047125f6871b0e7d07e05bcee
#
# 
# 
# delete "packages/linux/linux-rp-2.6.23/mmcsd_no_scr_check-r2.patch"
# 
# delete "packages/linux/linux-rp-2.6.23/pda-power.patch"
# 
# delete "packages/linux/linux-rp-2.6.23/vt_ioctl_race.patch"
# 
# delete "packages/linux/linux-rp-2.6.23/w100fb-unused-var.patch"
# 
# patch "packages/linux/linux-rp_2.6.23.bb"
#  from [99ffae255f9fe9face60143c180663c84afce579]
#    to [a8b6b284608500d88744ab8b8004b1b3f5ec0409]
# 
============================================================
--- packages/linux/linux-rp_2.6.23.bb	99ffae255f9fe9face60143c180663c84afce579
+++ packages/linux/linux-rp_2.6.23.bb	a8b6b284608500d88744ab8b8004b1b3f5ec0409
@@ -1,6 +1,6 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r23"
+PR = "r24"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -14,10 +14,15 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
-           file://hrw-add-wcf11-to-hostap.patch;patch=1;status=pending \
-           ${RPSRC}/lzo_jffs2-r3.patch;patch=1 \
-           ${RPSRC}/lzo_crypto-r2.patch;patch=1 \
-           ${RPSRC}/lzo_jffs2_lzomode-r1.patch;patch=1 \
+           ${RPSRC}/pxa25x_suspend_fixes-r0.patch;patch=1;status=merged \
+           ${RPSRC}/lzo_jffs2-r3.patch;patch=1;status=merged \
+           ${RPSRC}/lzo_jffs2_lzomode-r1.patch;patch=1;status=merged \
+           ${RPSRC}/spitzkbd_fix-r0.patch;patch=1;status=merged \
+           file://uvesafb-0.1-rc3-2.6.22.patch;patch=1;status=merged \
+           ${RPSRC}/locomo_led_fix-r0.patch;patch=1;status=merged \
+           file://hrw-add-wcf11-to-hostap.patch;patch=1;status=merged \
+           ${RPSRC}/export_atags-r0.patch;patch=1;status=pending \
+           ${RPSRC}/lzo_crypto-r2.patch;patch=1;status=pending \
            ${RPSRC}/lzo_jffs2_sysfs-r1.patch;patch=1 \
            ${RPSRC}/hx2750_base-r29.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r9.patch;patch=1 \
@@ -32,33 +37,27 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/
            ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \
            ${RPSRC}/usb_pxa27x_udc-r6.patch;patch=1 \
            ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \
-           ${RPSRC}/poodle_pm-r4.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r6.patch;patch=1 \
-           ${RPSRC}/w100_extaccel-r1.patch;patch=1 \
+           ${RPSRC}/w100_extaccel-r2.patch;patch=1 \
            ${RPSRC}/w100_extmem-r1.patch;patch=1 \
-           ${RPSRC}/spitzkbd_fix-r0.patch;patch=1 \
-           ${RPSRC}/export_atags-r0.patch;patch=1 \
-           ${RPSRC}/pxa25x_suspend_fixes-r0.patch;patch=1 \
+           ${RPSRC}/poodle_pm-r4.patch;patch=1 \
            ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1 \
            ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1 \
-           ${RPSRC}/locomo_led_fix-r0.patch;patch=1 \
-           file://w100fb-unused-var.patch;patch=1 \
-           file://hostap-monitor-mode.patch;patch=1 \
-           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
+           file://squashfs3.0-2.6.15.patch;patch=1;status=external \
            ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \
-           ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
+           file://hostap-monitor-mode.patch;patch=1;status=unmergable \
+           file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1;status=unmergable \
            ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack \
-           file://mmcsd_no_scr_check-r2.patch;patch=1 \
+           ${RPSRC}/mmcsd_no_scr_check-r2.patch;patch=1;status=hack \
            ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
            file://pxa-serial-hack.patch;patch=1;status=hack \
            file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
            file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
-           file://squashfs3.0-2.6.15.patch;patch=1;status=external \
-           file://uvesafb-0.1-rc3-2.6.22.patch;patch=1;status=external \
            file://htcuni.patch;patch=1 \
            file://binutils-buildid-arm.patch;patch=1 \
+           file://versatile-armv6.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-collie \